Extended Wayhistory bugs fixed and tested.