Moved some distribution and random helpers around
Replaced draw with generate for random variable generation