Remove old comments, print out errors and fix small logic error