small design fixes and additions