fix 0.006b

Make more code fixes
merging validation conflicts
resolving branch conflicts for validation.php