Changed comments, improved Checker