fixed movement, collision detection needs to be redone