next round of design fixes