diff --git a/mdm/login.c b/mdm/login.c
index 09b7234..e4c14d8 100644
--- a/mdm/login.c
+++ b/mdm/login.c
@@ -4,7 +4,7 @@
 #include <security/pam_appl.h>
 #include <stb_ds.h>
 
-MwWidget root;
+MwWidget root = NULL;
 MwWidget window, sesscombo, usercombo, passentry, reason;
 
 typedef struct session {
diff --git a/mdm/xserver.c b/mdm/xserver.c
index 5f8a556..45eda20 100644
--- a/mdm/xserver.c
+++ b/mdm/xserver.c
@@ -50,6 +50,14 @@ static int wm_detect(Display* disp, XErrorEvent* ev) {
 }
 
 static void* x11_thread_routine(void* arg) {
+	while(1) {
+		pthread_mutex_lock(&xmutex);
+		if(root != NULL) {
+			pthread_mutex_unlock(&xmutex);
+			break;
+		}
+		pthread_mutex_unlock(&xmutex);
+	}
 	loop_x();
 	XCloseDisplay(xdisplay);
 	return NULL;
diff --git a/milkwm/milkwm.h b/milkwm/milkwm.h
index b386da7..655d786 100644
--- a/milkwm/milkwm.h
+++ b/milkwm/milkwm.h
@@ -32,6 +32,8 @@ void loop_x(void);
 void set_focus_x(MwWidget widget);
 
 /* wm.c */
+extern MwWidget root;
+
 void	 loop_wm(void);
 MwWidget wm_frame(int w, int h);
 void	 wm_destroy(MwWidget widget);
diff --git a/milkwm/wm.c b/milkwm/wm.c
index 5426603..cf589a0 100644
--- a/milkwm/wm.c
+++ b/milkwm/wm.c
@@ -3,7 +3,7 @@
 
 #include <stb_ds.h>
 
-static MwWidget root;
+MwWidget root = NULL;
 
 typedef struct wmframe {
 	MwWidget inside;
diff --git a/milkwm/xserver.c b/milkwm/xserver.c
index 607ab2a..7acfd78 100644
--- a/milkwm/xserver.c
+++ b/milkwm/xserver.c
@@ -15,6 +15,7 @@ static Atom milkwm_set_focus;
 typedef struct window {
 	MwWidget frame;
 	Window	 client;
+	int	 working;
 } window_t;
 static window_t* windows = NULL;
 
@@ -36,36 +37,44 @@ static void end_error(void) {
 }
 
 static void* x11_thread_routine(void* arg) {
+	while(1) {
+		pthread_mutex_lock(&xmutex);
+		if(root != NULL) {
+			pthread_mutex_unlock(&xmutex);
+			break;
+		}
+		pthread_mutex_unlock(&xmutex);
+	}
+
 	loop_x();
 	XCloseDisplay(xdisplay);
 	return NULL;
 }
 
 static Window focus = None, nofocus;
+static void   set_focus(Window w) {
+	  int i;
+	  for(i = 0; i < arrlen(windows); i++) {
+		  pthread_mutex_lock(&focusmutex);
+		  if(windows[i].client == w) {
+			  pthread_mutex_unlock(&focusmutex);
+			  wm_focus(windows[i].frame, 1);
+		  } else if(focus != w && focus == windows[i].client) {
+			  pthread_mutex_unlock(&focusmutex);
+			  wm_focus(windows[i].frame, 0);
+		  } else {
+			  pthread_mutex_unlock(&focusmutex);
+		  }
+	  }
 
-static void set_focus(Window w) {
-	int i;
-	for(i = 0; i < arrlen(windows); i++) {
-		pthread_mutex_lock(&focusmutex);
-		if(windows[i].client == w) {
-			pthread_mutex_unlock(&focusmutex);
-			wm_focus(windows[i].frame, 1);
-		} else if(focus != w && focus == windows[i].client) {
-			pthread_mutex_unlock(&focusmutex);
-			wm_focus(windows[i].frame, 0);
-		} else {
-			pthread_mutex_unlock(&focusmutex);
-		}
-	}
-
-	pthread_mutex_lock(&focusmutex);
-	focus = w;
-	if(w == None) {
-		XSetInputFocus(xdisplay, nofocus, RevertToParent, CurrentTime);
-	} else {
-		XSetInputFocus(xdisplay, w, RevertToParent, CurrentTime);
-	}
-	pthread_mutex_unlock(&focusmutex);
+	  pthread_mutex_lock(&focusmutex);
+	  focus = w;
+	  if(w == None) {
+		  XSetInputFocus(xdisplay, nofocus, RevertToParent, CurrentTime);
+	  } else {
+		  XSetInputFocus(xdisplay, w, RevertToParent, CurrentTime);
+	  }
+	  pthread_mutex_unlock(&focusmutex);
 }
 
 int init_x(void) {
@@ -78,7 +87,7 @@ int init_x(void) {
 	xdisplay = XOpenDisplay(NULL);
 
 	begin_error();
-	XSelectInput(xdisplay, DefaultRootWindow(xdisplay), SubstructureRedirectMask);
+	XSelectInput(xdisplay, DefaultRootWindow(xdisplay), SubstructureRedirectMask | SubstructureNotifyMask);
 	end_error();
 
 	if(error_happened) return 1;
@@ -258,6 +267,20 @@ void loop_x(void) {
 						XConfigureWindow(xdisplay, windows[i].frame->lowlevel->x11.window, CWWidth | CWHeight, &xwc);
 					}
 
+					break;
+				}
+			}
+		} else if(ev.type == CreateNotify) {
+			XWindowAttributes xwa;
+
+			XGetWindowAttributes(xdisplay, DefaultRootWindow(xdisplay), &xwa);
+
+			XMoveWindow(xdisplay, ev.xcreatewindow.window, rand() % (xwa.width - wm_entire_width(ev.xcreatewindow.width)), rand() % (xwa.height - wm_entire_height(ev.xcreatewindow.height)));
+		} else if(ev.type == DestroyNotify) {
+			for(i = 0; i < arrlen(windows); i++) {
+				if(windows[i].client == ev.xdestroywindow.window) {
+					wm_destroy(windows[i].frame);
+					arrdel(windows, i);
 					break;
 				}
 			}
@@ -287,29 +310,33 @@ void loop_x(void) {
 				}
 
 				XMoveWindow(xdisplay, ev.xmaprequest.window, xwa.x, xwa.y);
-
 				XMapWindow(xdisplay, ev.xmaprequest.window);
+				do {
+					XFlush(xdisplay);
+					XGetWindowAttributes(xdisplay, ev.xmaprequest.window, &xwa);
+				} while(xwa.map_state != IsViewable);
+
 				if(!XReparentWindow(xdisplay, windows[i].client, wm_get_inside(windows[i].frame)->lowlevel->x11.window, wm_content_x(), wm_content_y())) {
 					wm_destroy(windows[i].frame);
 					arrdel(windows, i);
 					continue;
 				}
-				if(!XMapWindow(xdisplay, windows[i].client)) {
-					wm_destroy(windows[i].frame);
-					arrdel(windows, i);
-					continue;
-				}
-				XFlush(xdisplay);
+				XMapWindow(xdisplay, windows[i].client);
 				continue;
 			}
 
-			w.frame	 = wm_frame(xwa.width, xwa.height);
-			w.client = ev.xmaprequest.window;
+			w.frame	  = wm_frame(xwa.width, xwa.height);
+			w.client  = ev.xmaprequest.window;
+			w.working = 1;
 			save(w.client);
 
-			arrput(windows, w);
+			if(ret) {
+				wm_destroy(w.frame);
+			} else {
+				arrput(windows, w);
 
-			set_name(w.client);
+				set_name(w.client);
+			}
 		} else if(ev.type == PropertyNotify) {
 			int i;
 			for(i = 0; i < arrlen(windows); i++) {
@@ -324,11 +351,29 @@ void loop_x(void) {
 			}
 		} else if(ev.type == MapNotify) {
 			int i;
+			if(ev.xmap.override_redirect) continue;
+
 			for(i = 0; i < arrlen(windows); i++) {
 				if(windows[i].client == ev.xmap.window) {
+					if(windows[i].frame == NULL) printf("wtf?\n");
 					set_focus(windows[i].client);
+					windows[i].working = 0;
 					break;
-				}
+				} else if(windows[i].frame->lowlevel->x11.window == ev.xmap.window || nofocus == ev.xmap.window)
+					break;
+			}
+
+			if(i == arrlen(windows)) {
+				window_t	  w;
+				XWindowAttributes xwa;
+
+				XGetWindowAttributes(xdisplay, ev.xmap.window, &xwa);
+
+				w.frame	  = wm_frame(xwa.width, xwa.height);
+				w.client  = ev.xmap.window;
+				w.working = 1;
+				save(w.client);
+				arrput(windows, w);
 			}
 		} else if(ev.type == UnmapNotify) {
 			int i;
@@ -336,15 +381,22 @@ void loop_x(void) {
 			for(i = 0; i < arrlen(windows); i++) {
 				if(windows[i].client == ev.xunmap.window) {
 					XWindowAttributes xwa;
+					int		  x, y;
 
 					if(XGetWindowAttributes(xdisplay, windows[i].client, &xwa)) {
 						if(xwa.map_state == IsViewable) {
 							nvm = 1;
 							break;
 						}
+					} else if(windows[i].working) {
+						nvm = 1;
+						break;
 					}
+
+					x = xwa.x;
+					y = xwa.y;
 					if(XGetWindowAttributes(xdisplay, windows[i].frame->lowlevel->x11.window, &xwa)) {
-						XReparentWindow(xdisplay, windows[i].client, DefaultRootWindow(xdisplay), xwa.x, xwa.y);
+						XReparentWindow(xdisplay, windows[i].client, DefaultRootWindow(xdisplay), xwa.x + x, xwa.y + y);
 					}
 
 					wm_destroy(windows[i].frame);