many syntax fixes