revise validations
bump
add valid_with_server?