Forgot to branch. Fixed some move bugs