Calculator fixes and additions along with minor updates.