Checker improvements

As per issue #5.