Tidying up
Moved around some sections, experiment with internal hyperlinks
Name consistency and internal hyperlinks