validations and other code improved