more regex fixes