add read_wait option, change the API for adding headers a bit