syntax error fixes
more syntax changes