B41: traps, effects and a bunch of tweaks