Typo and add config options