Add & correct exercises