some more regex updates/fixes