Improve map display
Make map debug conditional and enable tracking full debug mode