Made some CS2 Exam2 stuff fit better

Much remains to be done