fix some bugs, change the way days_carried_over are counted