Calculator fixes live and merged in!