Timefly

crash fix. minor code cleanup