fix typo, test a bit, rearrange in settings file