Fixes to template - missing double quotes, spacing, added support to comment out a property=value by initializing with a pound sign for some attr