Validation!
Minor changes