Many minor edits based on review