various design fixes
various design fixes