Optimised heatmap and other minor changes. ASCII art.