Tweaks and syntax fixes.