General syntax and functional fixes.