Starting to record times. Lots of misc updates