Try to auto-detect CD-ROMs, fixed some logic, etc.