config improvements

Getting ready for release