tweaking some dislpay bugs when values are very large
merging