more syntax bugs fixed