a few design fixes