bring in the updates for campain setting and small refactors as listed