Changes to test UI;  Add error recovery.