merged latest red-pen edits