Fixes problem with nwithdraw and nloss columns. Also adds other funding source