quick design fixes #7