Donations, minor cleanup