ENH: fixed some failing plots, cleaned up heatmaps