Fixed some typo's and validation errors