Minor changes to sections previously commented out