further design fixes