initial syntax fixes