still small bug under fund, fixed other issues