Found some mistakes and did up to #7