Sorted out a few problems with config