added uniform and binomial; changed signature of multinomial