fixes to collision system, seems pretty good now