fixed bugs - validation
Merge branch 'raysmond'