Cleaned up parsers to be more generic
Fixing up dates and values.