Fixed collision hopefully

Enabled collision handling again. It's really trippy, so this should
manage it.