fixed: 2 movement bugs