cleanup commented code
fix some regressions
Merge pull request #62 from CharlesGust/savedata1st

Savedata1st