Editing

Basic editing updates. Kindly review if they can be merged to master.