bump call timeout
merge bernies stuff