Modified config names slightly and other good things