Heat map and fixes