refactor Parser

-refactor Parser
-add handling of cases where there is time but not date, to set the
current date as a default