final draft: part 1 ++ design fixes