Non-profit demo fixes -1
fixes #140
fixes #141
fixes #88
fixes #148

partially fixes
Merge pull request #179 from karma-exchange-org/np-fixes1

Non-profit demo fixes -1