fixed move bug
moved things around (again). last time (probably)
Merge branch 'master' of github.com:BenedictEggers/coelacanth