Big Integer, Big Decimal and fix mistakes