applying first round of design fixes