Multiple enhancements - mostly to GUI.