more cleaning + add eqexam stuff in there