Now supports (but doesnt enforce) time in MS format
Fixed MS time