Fix bugs in the calulators
Bump version