adding comments, stats. Plus some cleanup