Fixes to use BigDecimal
More work on bean