WYRL: some bug fixes.
WYRL: bug fix motivated from logic example.