changed table formatting, merged sect 3.5 and 3.6
automerged with Maxwell's changes