committ 13

small design fixes