Updates to discreteRV, ready for initial review