Tweaks for BigDecimals, but still not working properly