Syntax fixes and minor improvements.