minor edits and fixes