selecting day fixed
cleaning and refactoring
Feature addHeat inserted