Update for Caloris 1.0, errors fixed