adds bandwidth heatmaps, code cleanup