Addresses issues 4 & 5 I filed

Here are patches to address the two problems that can cause random number generation to become un-reproducible even when controlling the `*mt-random-state*`