minor edits; tests succeed