More calculator updates