Add funding, fix issues and some improvements