Now works with intralipid data.  Other minor changes.