finished main text and major reorganisation