Fix bugs, and use the new movement code.