cleaned up code
better collision detection working but very buggy