WYRL: various bug fixes; patterns are now working on their own without the original generated pattern matching.