Improvements and corrections of pattern matching capability.