Updated Regexer again and fixed remaining errors.