cna extend configs, some other small fixes