Mash Map done with other bugs fixed