small design fixes.