move some settings around, cosmetic
move settings out
cosmetic fixes