fix small errors and validation messages