Tweaked map renderer: still buggy