Validation + minor fixes