performance and storage fixes