addressing and design fixes