Calculator updates.  Still not working completely