Bug fixes. Preloading now configurable.