Fix some issues and movement