Added some locking
Added some locking
Small changes to Storage<T>