moved nonprofits & bugfixes