Punctuation, cleanup settings a bit, add missing variable