Although discussions were mild as the State Board of Education began making final edits to new social studies guidelines for Texas schools, several controversial plans - including toning down criticism of McCarthyism - were expected to draw heated debate Thursday.