Minor updates to calculator