Saving time as ISO8601 instead of timestamp - future proofing! - plus small enhancements