Moved more storages to storage table, some bugfixes