Intro restructured
Removed HS refs
Last bunch of Giulio's changes