fix annoying debug bug
Fix trap handling

Logic was arse backwards
Also some small performance tweaks, overall performance is still > 100us/instr