changes to calcbase parser