brute force fixes
Merge pull request #341 from patriot1burke/master

brute force fixes