some fix

time fixes. and TODO