Fix task 2 in øving 6 and polish øving 7

This commit will fix some misunderstood task and make some code slightly
better.