Various fixes, and possibility to set trigger efficiency