Bug Fixing, map working

Fixed a formula, added more randomness to random data, fixed color
generation