ISO8601 bug fixes and cleanup
cleanup