Mostly bugfixes, with_ngi_config wrapper is still WIP