Lots of syntax error fixes.