Done except for ToC and images
Tidied up structured