Heat Map Bugs

Fixed