Fixing math calculation and display