Derped a lot. Added stuff I apparently took out ages ago which screwed up punctuation removal, I think it is fixed now.