small design changes
/