finished cal by days, fixed problems