re-enabled validation, some formatting