Koss's fixes
Hours, minutes, seconds
Seconds, milliseconds added. Some code rearrangement