Cleaned up code, added some info to StatsActivity