Comments, tidyup and changed timings