finish validations, and some changes on application