Implemented collisions
Small fixes