Finalized the map creation

And fixed some other issues
Finalized map creation