Lots of tweaks, and continued work on donation feature