disc: final tweaks