Implement validation, fix 2 typos