Small edits before handing over assignment to Stuffe