GUI and other corrections.