various changes to storage and overlay