Done a bit more work on collisions.