started on validate fixes
Merge pull request #75 from lewenhagen/master

started on validate fixes