collision fixes
working on collisions