Updated a couple unused patterns that had broken at some point.
Updated to 2.1.8 and a couple minor changes.