some more additions re FS and clean-up