updated status
updated timekeeping
Minor fixes to tests.