Preface and other edits