Fixed random generators to generate uniform integer with inclusive bounds. Fixed some other plaes to compile with new PRG
merged