work in progress
numbers appearing on save/load fixed
Merge branch 'update-fix'