some work on S3, mainly 3.1 + reorganisation of 3.2+