made validation related corrections.