manually incorporated noams punc changes, closes #6