Some fixes to move()

Just some tweaks I've made for use in a project.