fixed ISO8601 date/time expansion and also fixed formatting (now using 2...

...4 hours format)