Tweaks to internal consistency checking
Merge pull request #50 from crawley/master

Tweaks