Collision

Did various things related to collision and left a few todo here and
there.