preserve date, validation fixes
removed old .option and toJSON calls