some fixes to exercises