merged updates from negative-binomial-stuff branch