Fix Movement Bugs