fixed merge problems with temperature and the modifications done to the level
fix some scaling issues