More parsing of user time input
Fixed merge conflicts