Automated tests. PreParse can take extra replacement patterns. Minor bugfixes and improvements.