Refactored settings, added punctuation = accept