Integrating Ricardo K's code with added code

This updateintegrates the dectection and traps added by Ricardo. Adds
code in main and world as well. I've added several minor updates as well
to fit in my fatal collision.

Note: I could not test this properly because my desktop keeps yapping
about a missing lib. If this breaks anything, revert change.