Fix issues, and some minor tweaks to donation object