Fix SunSpot and minor fix in calentry