Mostly copying over more intro/discussion...

And some formatting tweaks throughout fixing things