+ class name change, storage related bug fix