Config update, didn't move from local.
Code review, checkstyles, documentation.