Feature/bug buster

These mails were in the code twice. Here and in apps/fund.