Fixed some typos and validation errors