Added calcmass, updated calcacel