upd base_classes & gui