third round of syntax fixes