more regex updates
yet more regex updates with tests