small edits before trying to merge