Non-profit demo fixes -1

fixes #140
fixes #141
fixes #88
fixes #148

partially fixes