Edited versioning, preface etc.
merged all changes