Fixed my pull request mess-up with stats
Added listeners
More pull request messup fixes