Config corrections from next update

Ninjaed from WIP work on the new pack.