syntax fixes, added missing features