Made some fixes to collisions

and resolutions.