Syntax and bug fixes.