re-organize
fix heatmap bug, re-organize caching