Got rid of percentages because they fixed the bug, and updated a couple broken regexes.