fix erro and add calendar