fixed some derps + regexes