heatmap, cleanup

-heatmap working now
- cleaned up interface a bit for milestone