diff --git a/src/add-ons/accelerants/nvidia/engine/nv_acc.c b/src/add-ons/accelerants/nvidia/engine/nv_acc.c
index 6c945497af..82794ee36a 100644
--- a/src/add-ons/accelerants/nvidia/engine/nv_acc.c
+++ b/src/add-ons/accelerants/nvidia/engine/nv_acc.c
@@ -681,15 +681,6 @@ status_t nv_acc_init()
 	/* setup some extra stuff for NV30A and later */
 	if (si->ps.card_arch >= NV30A)
 	{
-/*
-	fixme: Does not belong here (and not needed?)
-	if(!chip->flatPanel)
-	{
-    	chip->PRAMDAC0[0x0578/4] = state->vpllB;	//0x00680578 = ??? never modified!
-    	chip->PRAMDAC0[0x057C/4] = state->vpll2B;	//0x0068057c = ??? never modified!
-	}
-*/
-
 		/* activate Zcullflush(?) */
 		ACCW(DEBUG3, (ACCR(DEBUG3) | 0x00000001));
 		/* unknown */
@@ -763,11 +754,6 @@ status_t nv_acc_init()
 	/*** setup tile and pipe stuff ***/
 	if (si->ps.card_arch >= NV10A)
 	{
-/*
-	fixme: setup elsewhere (does not belong here):
-	chip->PRAMDAC[0x00000404/4] |= (1 << 25);//0x00680404 = ???
-*/
-
 		/* setup acc engine tile stuff: */
 		/* reset tile adresses */
 		ACCW(NV10_FBTIL0AD, 0);
diff --git a/src/add-ons/accelerants/nvidia/engine/nv_crtc.c b/src/add-ons/accelerants/nvidia/engine/nv_crtc.c
index 0cd2eeb986..0bd8748a42 100644
--- a/src/add-ons/accelerants/nvidia/engine/nv_crtc.c
+++ b/src/add-ons/accelerants/nvidia/engine/nv_crtc.c
@@ -1,6 +1,6 @@
 /* CTRC functionality */
 /* Author:
-   Rudolf Cornelissen 11/2002-9/2004
+   Rudolf Cornelissen 11/2002-1/2005
 */
 
 #define MODULE_BIT 0x00040000
@@ -701,6 +701,10 @@ status_t nv_crtc_cursor_init()
 	/* select 32x32 pixel, 16bit color cursorbitmap, no doublescan */
 	NV_REG32(NV32_CURCONF) = 0x02000100;
 
+	/* activate hardware-sync between cursor updates and vertical retrace */
+	if (si->ps.card_arch >= NV10A)
+		DACW(NV10_CURSYNC, (DACR(NV10_CURSYNC) | 0x02000000));
+
 	/* activate hardware cursor */
 	nv_crtc_cursor_show();
 
@@ -790,7 +794,7 @@ status_t nv_crtc_cursor_define(uint8* andMask,uint8* xorMask)
 /* position the cursor */
 status_t nv_crtc_cursor_position(uint16 x, uint16 y)
 {
-	uint16 yhigh;
+//	uint16 yhigh;
 
 	/* make sure we are beyond the first line of the cursorbitmap being drawn during
 	 * updating the position to prevent distortions: no double buffering feature */
@@ -798,29 +802,29 @@ status_t nv_crtc_cursor_position(uint16 x, uint16 y)
 	 * we need to return as quick as possible or some apps will exhibit lagging.. */
 
 	/* read the old cursor Y position */
-	yhigh = ((DACR(CURPOS) & 0x0fff0000) >> 16); 
+//	yhigh = ((DACR(CURPOS) & 0x0fff0000) >> 16); 
 	/* make sure we will wait until we are below both the old and new Y position:
 	 * visible cursorbitmap drawing needs to be done at least... */
-	if (y > yhigh) yhigh = y;
+//	if (y > yhigh) yhigh = y;
 
-	if (yhigh < (si->dm.timing.v_display - 16))
-	{
+//	if (yhigh < (si->dm.timing.v_display - 16))
+//	{
 		/* we have vertical lines below old and new cursorposition to spare. So we
 		 * update the cursor postion 'mid-screen', but below that area. */
-		while (((uint16)(NV_REG32(NV32_RASTER) & 0x000007ff)) < (yhigh + 16))
-		{
-			snooze(10);
-		}
-	}
-	else
-	{
+//		while (((uint16)(NV_REG32(NV32_RASTER) & 0x000007ff)) < (yhigh + 16))
+//		{
+//			snooze(10);
+//		}
+//	}
+//	else
+//	{
 		/* no room to spare, just wait for retrace (is relatively slow) */
-		while ((NV_REG32(NV32_RASTER) & 0x000007ff) < si->dm.timing.v_display)
-		{
+//		while ((NV_REG32(NV32_RASTER) & 0x000007ff) < si->dm.timing.v_display)
+//		{
 			/* don't snooze much longer or retrace might get missed! */
-			snooze(10);
-		}
-	}
+//			snooze(10);
+//		}
+//	}
 
 	/* update cursorposition */
 	DACW(CURPOS, ((x & 0x0fff) | ((y & 0x0fff) << 16)));