Second batch of edits...