some more syntax fixes