Improve file vs. text tree import; misc bug fixes