Trap and statusmodifier fixes
Merge branch 'master' of https://github.com/uninterruptables/szl4_repo.git