Fixes

Forgot to edit a variable to something simpler when I changed to the new API and also got my regex methods mixed up.