Map can be seen now. Hurrah.

Some code cleaning is still needed tho.