Discussion enhancement + lots of minor stylistic corrections