rob shops fix and more position saving.
Merge pull request #250 from ThePyrotechnic/Dev

rob shops fix and more position saving.