better validation, typos