some design fixes + enhancements