Remove cruft, better stats, add TO-DOs