fix #20 and simplify accordingly
fix ensuing spelling errors from validator