S3 rorganisation
back to old (shorter) argument names
forgotten code removed
clean-up