Edits based on more comments from Eric Stocker