discussion changes

relocating discussions into topical sections