Edits based on Dan's comments