some minor fixes after feedback from weekly meeting