further cleanup, GUI options