minor design fixes