proper section references and cosmetic changes