several aesthetics improvements