Two new exercises (one not yet finished) + an edit