Corrected some time keeping errors