Stats file updates + test updates + bug fixes
Code cleanup
Merge pull request #43 from carlacummins/master

Stats file updates & bug fixes