validation bbugs fixed