Tidy up and work on tracking stats.