extended case study & minor fixes