lots of fixes and sectional reorganisation