Update GUI and Comments