Added constructor methods and changed some missed bignumber convertions, some cleanup