Use develop branch now
Fixes from manual testing