donation working, some cleanup