Triage todo
Fix parameter substition usage in setting defaults

Also more correct quotation introduced.
Fixed bug with incorrect quote used
Less todo