some minor design fixes... re-establishing...