some syntax fixes