Fixes and add Fundrazr