Some functional work & some preloading performance improvements.