Now handles punctuation correctly, and enforces usage well