fix typos
simplify date/time parsing