more validation cases
fix some error messages