validator fixes
Merge pull request #351 from patriot1burke/master

validator fixes