General editing

Work in progress.