Some minor changes

Nothing special just rewriting some code for collision detection to
work..