merge issues for calculations.js fixed and tested on local branch