Fixed bugs, rigged RNG
Merged and rerigged RNG