Add support for 2 new checkers and a few minor bug fixes.

I have fixed all the review comments - So am trying out the 'Pull Request' let me know if this is ok.

Cheers
Daniel Laird