some settings were not saved correctly
removed some redundant and out of place lines