syntax fixes and updates