movement bug fix
hitTest into its own function