more work on traps implementation
fix binary arithmetic
Merge remote-tracking branch 'origin/traps'