tasks 31, 32

Corrected mistakes according to feedback.