Bug fixes; also, cancel drag when dragging back to home spot