Enhanced INT return handling, and reorganized some disks.