minor changes
merge fix
minor edits