more cleanup, gui fix