improved all collisions and fixed a couple of bugs