General syntax and functional fixes.
Merge commit