bringing in most of joan's edits
final edits