some improvements/ui;