lori's suggestions incorporated
merge, other minor changes
merge
merge