some initial syntax fixes