Numerous edits