Various fixes, based on functional testing

- Mostly typos that led to parse and/or syntax errors