small update + tfs support for lazy loaders w/jim