fixed storage.cs methods and some constructors