work/fixes on file storage implementation