some changes from donationinfo branch

Check it out.