Add quotes around variables, in case they have spaces or other chars
Correct comment chars, and move the user-editables to the top of the config file