More tweaks, bug fixes, and finishing up donation feature