Updated some configuration, references and guidance.