small design improvements