Small changes to calculator