few design fixes