Dr. Hofmann's discreteRV suggestions, lots of updates