move sensitive settings to a config file and make some cosmetic fixes