Config update, some refactoring, bearing guide fixes.