Bug fixes, minor edits.
Minor edit.