Updated collisions (hopefully for good)

Also made level paths nicer