added geometric and negative binomial; refactored plotting functions