Bug, language, and syntax fixes!