added disc 7 solutions, fixed def