RANDOM MAP, FIXES
Merged with master