more improvements, bug fixes for the gui