Updated and cleaned up configs