Made some calculator changes.