Update Guide and in-code documentation