more syntax tweaks