fixed movement and added dragging