diff --git a/src/add-ons/kernel/bus_managers/ata/ata.c b/src/add-ons/kernel/bus_managers/ata/ata.c
index f2e722c9c4..df97f535f8 100644
--- a/src/add-ons/kernel/bus_managers/ata/ata.c
+++ b/src/add-ons/kernel/bus_managers/ata/ata.c
@@ -102,7 +102,6 @@ ata_wait(ide_bus_info *bus, uint8 set, uint8 cleared,
 			return B_ERROR;
 
 		if ((status & set) == set && (status & cleared) == 0) {
-			dprintf("ata_wait: set %x, cleared %x, elapsed time %lld\n", set, cleared, elapsedTime);
 			return B_OK;
 		}
 
@@ -111,10 +110,10 @@ ata_wait(ide_bus_info *bus, uint8 set, uint8 cleared,
 		if (elapsedTime > timeout)
 			return B_TIMED_OUT;
 		
-		if (elapsedTime < 150000)
+		if (elapsedTime < 4000)
 			spin(1);
 		else
-			snooze(3000);
+			snooze(4000);
 	}
 }
 
@@ -167,7 +166,7 @@ ata_send_command(ide_device_info *device, ata_request *request, ata_flags flags,
 	ide_bus_info *bus = device->bus;
 
 	ASSERT((device->tf_param_mask & ide_mask_command) == 0);
-	ASSERT(bus->state == ata_state_busy);
+//	ASSERT(bus->state == ata_state_busy); // XXX fix this
 
 	ASSERT((flags & ATA_DMA_TRANSFER) == 0); // XXX only pio for now
 
@@ -205,7 +204,7 @@ ata_send_command(ide_device_info *device, ata_request *request, ata_flags flags,
 	if (bus->controller->write_command_block_regs(bus->channel_cookie, &device->tf,	device->tf_param_mask) != B_OK)
 		goto err;
 
-	FLOW("Writing command 0x%02x\n", (int)device->tf.write.command);
+//	FLOW("Writing command 0x%02x\n", (int)device->tf.write.command);
 
 	IDE_LOCK(bus);
 
@@ -219,7 +218,7 @@ ata_send_command(ide_device_info *device, ata_request *request, ata_flags flags,
 	if (bus->controller->write_command_block_regs(bus->channel_cookie, &device->tf, ide_mask_command) != B_OK) 
 		goto err_clearint;
 
-	ASSERT(bus->state == ata_state_busy);
+//	ASSERT(bus->state == ata_state_busy); XXX fix this
 
 	bus->state = (flags & ATA_DMA_TRANSFER) ? ata_state_dma : ata_state_pio;
 	request->timeout = timeout;
@@ -820,10 +819,8 @@ ata_exec_pio_transfer(ata_request *request)
 	uint32 timeout = request->ccb->timeout > 0 ? 
 		request->ccb->timeout * 1000 : IDE_STD_TIMEOUT;
 
-//	FLOW("ata_exec_pio_transfer\n");
-
-	FLOW("ata_exec_pio_transfer: length %d, left_sg_elem %d, cur_sg_elem %d, cur_sg_ofs %d\n",
-		request->ccb->data_length, device->left_sg_elem, device->cur_sg_elem, device->cur_sg_ofs);
+//	FLOW("ata_exec_pio_transfer: length %d, left_sg_elem %d, cur_sg_elem %d, cur_sg_ofs %d\n",
+//		request->ccb->data_length, device->left_sg_elem, device->cur_sg_elem, device->cur_sg_ofs);
 
 	if (ata_wait(bus, ide_status_drq, ide_status_bsy, 0, 4000000) != B_OK) {
 		TRACE("ata_exec_pio_transfer: wait failed\n");
@@ -832,16 +829,16 @@ ata_exec_pio_transfer(ata_request *request)
 
 	while (device->left_blocks > 0) {
 		if (request->is_write) {
-			FLOW("writing 1 block\n");
+//			FLOW("writing 1 block\n");
 			if (write_PIO_block(request, 512) != B_OK)
 				goto transfer_error;
 		} else {
-			FLOW("reading 1 block\n");
+//			FLOW("reading 1 block\n");
 			if (read_PIO_block(request, 512) != B_OK)
 				goto transfer_error;
 		}
 		device->left_blocks--;
-		FLOW("%d blocks left\n", device->left_blocks);
+//		FLOW("%d blocks left\n", device->left_blocks);
 	}
 
 	if (ata_wait_for_drqdown(bus) != B_OK) {
diff --git a/src/add-ons/kernel/bus_managers/ata/ide_sim.c b/src/add-ons/kernel/bus_managers/ata/ide_sim.c
index 68359760df..9564451db0 100644
--- a/src/add-ons/kernel/bus_managers/ata/ide_sim.c
+++ b/src/add-ons/kernel/bus_managers/ata/ide_sim.c
@@ -69,12 +69,12 @@ sim_scsi_io(ide_bus_info *bus, scsi_ccb *ccb)
 	ata_request_start(&request, device, ccb);
 
 	if (request) {
-		TRACE("calling exec_io: %p, %d:%d\n", bus, ccb->target_id, ccb->target_lun);
+		FLOW("calling exec_io: %p, %d:%d\n", bus, ccb->target_id, ccb->target_lun);
 		device->exec_io(device, request);
 		return;
 	}
 
-	TRACE("Bus busy\n");
+	TRACE("Bus busy %d:%d\n", ccb->target_id, ccb->target_lun);
 	ACQUIRE_BEN(&bus->status_report_ben);
 	scsi->requeue(ccb, true);
 	RELEASE_BEN(&bus->status_report_ben);
@@ -82,7 +82,6 @@ sim_scsi_io(ide_bus_info *bus, scsi_ccb *ccb)
 
 
 err_inv_device:
-
 	FLOW("Invalid device %d:%d\n", ccb->target_id, ccb->target_lun);
 	ccb->subsys_status = SCSI_SEL_TIMEOUT;
 	ACQUIRE_BEN(&bus->status_report_ben);
@@ -92,8 +91,7 @@ err_inv_device:
 
 
 err_disconnected:
-
-	TRACE("No controller anymore\n");
+	TRACE("No controller anymore %d:%d\n", ccb->target_id, ccb->target_lun);
 	ccb->subsys_status = SCSI_NO_HBA;
 	ACQUIRE_BEN(&bus->status_report_ben);
 	scsi->finished(ccb, 1);
diff --git a/src/add-ons/kernel/bus_managers/ata/scsi2ata.c b/src/add-ons/kernel/bus_managers/ata/scsi2ata.c
index e99e5c41d5..d7aac05c41 100644
--- a/src/add-ons/kernel/bus_managers/ata/scsi2ata.c
+++ b/src/add-ons/kernel/bus_managers/ata/scsi2ata.c
@@ -421,7 +421,7 @@ ata_exec_io(ide_device_info *device, ata_request *request)
 {
 	scsi_ccb *ccb = request->ccb;
 	
-	FLOW("ata_exec_io: scsi command 0x%02x\n", ccb->cdb[0]);
+	//FLOW("ata_exec_io: scsi command 0x%02x\n", ccb->cdb[0]);
 		
 	// ATA devices have one LUN only
 	if (ccb->target_lun != 0) {
@@ -532,7 +532,7 @@ ata_exec_io(ide_device_info *device, ata_request *request)
 				| (uint32)cmd->low_lba;
 			length = cmd->length != 0 ? cmd->length : 256;
 
-			FLOW("READ6/WRITE6 pos=%lx, length=%lx\n", pos, length);
+			//FLOW("READ6/WRITE6 pos=%lx, length=%lx\n", pos, length);
 
 			ata_exec_read_write(device, request, pos, length, cmd->opcode == SCSI_OP_WRITE_6);
 			return;
@@ -548,7 +548,7 @@ ata_exec_io(ide_device_info *device, ata_request *request)
 			pos = B_BENDIAN_TO_HOST_INT32(cmd->lba);
 			length = B_BENDIAN_TO_HOST_INT16(cmd->length);
 
-			FLOW("READ10/WRITE10 pos=%lx, length=%lx\n", pos, length);
+			//FLOW("READ10/WRITE10 pos=%lx, length=%lx\n", pos, length);
 
 			if (length != 0) {
 				ata_exec_read_write(device, request, pos, length, cmd->opcode == SCSI_OP_WRITE_10);