more storage stuff. fixme: _fill_restraint_table