Refined traps to reset on death except if they were disarmed.
Removed prints from different places