Searching, moved swap files, improved clarity.