Finding errors, adding comments