Syntax fixes and version rev