a few small design changes