Fix to make CaloMode = 0 work as well and improved comments