More work on stats, and bug fixes!
Fixed some Lint errors