Minor adjuestments, final A2 task

Need to double check with Sondre.