* Properly bomb out if there's no CD in the drive
* Integrate Rafi's patch
* Integrate Shane's patch
