Recent edits and fixes