Changes and fixes to moves, added tracking of origin location