bug and design fixes