fix minor syntax errors, and false schema keywords
Merge branch 'fix' into development