refactor.. finish validation messages