added addressing into Disks;
some fixes;