Lots of Resource-FS work, and also some other tuning