Typo fix + Plugin configuration + UI specific file
Tidy up the JetBrains comments

Amends #1165
Merge branch 'fix-1165'