another round of misc disks and consistency fixes. nw.