Minor edits and adding note about merging patches from upstream.