Calculator Updates

Simple changes