some fixes
excersises done