Bug fixe 4 - final calculation errors correction
Format enhancement