Improve help messages
Satisfy ShellCheck
Tweak hiding secret config vars