initial design fixes