some movement fixes