more syntax improvements