some design fixes.