fixed some bugs; still 7 bugs in StorageHandler.java