disk caching & general improvements