diff --git a/new/box.c b/new/box.c
index b2b81d82..ed4ae3a1 100644
--- a/new/box.c
+++ b/new/box.c
@@ -108,7 +108,7 @@ static void boxPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_
 		*width += nStretchy * maxStretchyWidth;
 }
 
-static void boxResizeChildren(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d)
+static void boxResizeChildren(uiContainer *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d)
 {
 	box *b = (box *) c;
 	int xpadding, ypadding;
@@ -195,7 +195,6 @@ static void boxAppend(uiBox *ss, uiControl *c, int stretchy)
 		b->cap += boxCapGrow;
 		b->controls = (boxControl *) uiRealloc(b->controls, b->cap * sizeof (boxControl), "boxControl[]");
 	}
-	uiControlSetHasParent(c, 1);
 	b->controls[b->len].c = c;
 	b->controls[b->len].stretchy = stretchy;
 	b->len++;		// must be here for OS container updates to work
@@ -265,5 +264,5 @@ uiBox *uiNewVerticalBox(void)
 	bb = uiNewHorizontalBox();
 	b = (box *) bb;
 	b->vertical = 1;
-	return ss;
+	return bb;
 }
diff --git a/new/ui.idl b/new/ui.idl
index 7b463bfa..21af4c83 100644
--- a/new/ui.idl
+++ b/new/ui.idl
@@ -58,7 +58,7 @@ interface Control {
 
 interface Container from Control {
 	func ResizeChildren(x intmax_t, y intmax_t, width intmax_t, height intmax_t, d *Sizing);
-	func Update(voiid);
+	func Update(void);
 };
 func MakeContainer(c *Container);
 
diff --git a/new/windows/bin.c b/new/windows/bin.c
index 0e568153..3a59715b 100644
--- a/new/windows/bin.c
+++ b/new/windows/bin.c
@@ -72,7 +72,7 @@ uiContainer *newBin(void)
 	uiControl(b)->Destroy = binDestroy;
 	uiControl(b)->PreferredSize = binPreferredSize;
 
-	uiContainer(b)->ControlResize = binControlResize;
+	uiContainer(b)->ResizeChildren = binResizeChildren;
 
 	return uiContainer(b);
 }
@@ -103,8 +103,10 @@ void binSetMargins(uiContainer *c, intmax_t left, intmax_t top, intmax_t right,
 void binSetParent(uiContainer *c, uintptr_t osParent)
 {
 	struct bin *b = (struct bin *) c;
+	HWND hwnd;
 	HWND newParent = (HWND) osParent;
 
-	if (SetParent(b->hwnd, newParent) == 0)
+	hwnd = (HWND) uiControlHandle(uiControl(b));
+	if (SetParent(hwnd, newParent) == 0)
 		logLastError("error changing bin's parent in binSetParent()");
 }
diff --git a/new/windows/container.c b/new/windows/container.c
index 9d80170d..643d5cc0 100644
--- a/new/windows/container.c
+++ b/new/windows/container.c
@@ -18,7 +18,7 @@ struct container {
 
 static void resize(uiContainer *cc, RECT *r)
 {
-	struct container *c = (struct container *) (cc->Internal);
+	struct container *c = (struct container *) (uiControl(cc)->Internal);
 	uiSizing d;
 	uiSizingSys sys;
 	HDC dc;
@@ -50,18 +50,19 @@ static void resize(uiContainer *cc, RECT *r)
 	d.xPadding = uiDlgUnitsToX(winXPadding, sys.baseX);
 	d.yPadding = uiDlgUnitsToY(winYPadding, sys.baseY);
 	d.sys = &sys;
-	uiContainerResizeChildren(cc, r.left, r.top, r.right - r.left, r.bottom - r.top, &d);
+	uiContainerResizeChildren(cc, r->left, r->top, r->right - r->left, r->bottom - r->top, &d);
 }
 
 static LRESULT CALLBACK containerWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-	uiContainer *c;
+	uiContainer *cc;
+	struct container *c;
 	CREATESTRUCTW *cs = (CREATESTRUCTW *) lParam;
-	WINDOWPOSW *wp = (WINDOWPOSW *) lParam;
+	WINDOWPOS *wp = (WINDOWPOS *) lParam;
 	RECT r;
 
-	c = uiContainer(GetWindowLongPtrW(hwnd, GWLP_USERDATA));
-	if (c == NULL)
+	cc = uiContainer(GetWindowLongPtrW(hwnd, GWLP_USERDATA));
+	if (cc == NULL)
 		if (uMsg == WM_NCCREATE)
 			SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR) (cs->lpCreateParams));
 		// DO NOT RETURN DEFWINDOWPROC() HERE
@@ -78,18 +79,19 @@ static LRESULT CALLBACK containerWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 			break;
 		// fall through
 	case msgUpdateChild:
-		if (c == NULL)
+		if (cc == NULL)
 			break;
-		if (GetClientRect(pp->hwnd, &r) == 0)
+		c = (struct container *) (uiControl(cc)->Internal);
+		if (GetClientRect(c->hwnd, &r) == 0)
 			logLastError("error getting client rect for resize in parentWndProc()");
-		resize(c, &r);
+		resize(cc, &r);
 		return 0;
 	}
 
 	return DefWindowProcW(hwnd, uMsg, wParam, lParam);
 }
 
-const char *initContainer(void)
+const char *initContainer(HICON hDefaultIcon, HCURSOR hDefaultCursor)
 {
 	WNDCLASSW wc;
 
@@ -104,7 +106,7 @@ const char *initContainer(void)
 		return "registering uiContainer window class";
 
 	initialParent = CreateWindowExW(0,
-		uiOSContainerClass, L"",
+		containerClass, L"",
 		WS_OVERLAPPEDWINDOW,
 		0, 0,
 		100, 100,
@@ -134,12 +136,12 @@ static uintptr_t containerHandle(uiControl *cc)
 {
 	struct container *c = (struct container *) (cc->Internal);
 
-	return (uinptr_t) (c->hwnd);
+	return (uintptr_t) (c->hwnd);
 }
 
 static void containerSetParent(uiControl *cc, uiContainer *parent)
 {
-	struct contianer *c = (struct container *) cc;
+	struct container *c = (struct container *) cc;
 	uiContainer *oldparent;
 	HWND newparent;