more small design changes