Add BigDecimal conversions
Comment and minor fix