Add more wacky punct characters
Strip out \r's in verbatim blocks