use common base color when showing heat map, also removed some old TODOs