Syntax fixes to the support component, plus some formatting.
Merge pull request #392 from ozone-development/bug/391/supportSyntax

merging this now