Fixed ref
Minor edits
Merge branch 'development' of github.com:PhilGeek/formwithoutmatter into development