Additional collision improvements and stopping movement on collisions.

The next step will be reworking objects into a more uniform tree.