metapopulation refactor, qhfc fix