Decimals and Rounding Fixes

Complete? Needs more testing