Collision boxes fixed

And other small things...