Some improvements for the GUI version.