Manually-submitted edits.
Added Sergey's latest.