Little clean up - there are still some commented out lines that probably should be cleaned out, but they are handy for checking stats/debugging, so I've left them for now.