Fixed spelling
Added help to form config
Merge branch 'master' into plugins