improved validations and routes