diff --git a/README.md b/README.md
index 17e9bd5..a12a860 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # zgui v1.89.6 - dear imgui bindings
 
-Easy to use, hand-crafted API with default arguments, named parameters and Zig style text formatting. For a test application please see [here](https://github.com/michal-z/zig-gamedev/tree/main/samples/gui_test_wgpu).
+Easy to use, hand-crafted API with default arguments, named parameters and Zig style text formatting. [Here](https://github.com/michal-z/zig-gamedev/tree/main/samples/minimal_zgpu_zgui) is a simple sample application, and [here](https://github.com/michal-z/zig-gamedev/tree/main/samples/gui_test_wgpu) is a full one.
 
 ## Features
 
@@ -13,7 +13,7 @@ Easy to use, hand-crafted API with default arguments, named parameters and Zig s
 
 Copy `zgui` folder to a `libs` subdirectory of the root of your project.
 
-To get glfw/wgpu rendering backend working also copy `zgpu`, `zglfw` and `zpool` folders (see [zgpu](https://github.com/michal-z/zig-gamedev/tree/main/libs/zgpu) for the details). Alternatively, you can provide your own rendering backend, see: [backend_glfw_wgpu.zig](src/backend_glfw_wgpu.zig) for an example.
+To get glfw/wgpu rendering backend working also copy `zgpu`, `zglfw`, `zpool` and `system-sdk` folders (see [zgpu](https://github.com/michal-z/zig-gamedev/tree/main/libs/zgpu) for the details). Alternatively, you can provide your own rendering backend, see: [backend_glfw_wgpu.zig](src/backend_glfw_wgpu.zig) for an example.
 
 Then in your `build.zig` add:
 ```zig
diff --git a/build.zig b/build.zig
index d580371..117bfa9 100644
--- a/build.zig
+++ b/build.zig
@@ -72,8 +72,10 @@ pub fn package(
     zgui_c_cpp.addIncludePath(.{ .path = thisDir() ++ "/libs" });
     zgui_c_cpp.addIncludePath(.{ .path = thisDir() ++ "/libs/imgui" });
 
+    const abi = (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target.abi;
     zgui_c_cpp.linkLibC();
-    zgui_c_cpp.linkLibCpp();
+    if (abi != .msvc)
+        zgui_c_cpp.linkLibCpp();
 
     const cflags = &.{"-fno-sanitize=undefined"};
 
diff --git a/src/gui.zig b/src/gui.zig
index 1be97bc..338da3b 100644
--- a/src/gui.zig
+++ b/src/gui.zig
@@ -2703,7 +2703,7 @@ extern fn zguiSetNextItemOpen(is_open: bool, cond: Condition) void;
 //--------------------------------------------------------------------------------------------------
 pub const SelectableFlags = packed struct(u32) {
     dont_close_popups: bool = false,
-    span_all_colums: bool = false,
+    span_all_columns: bool = false,
     allow_double_click: bool = false,
     disabled: bool = false,
     allow_item_overlap: bool = false,
diff --git a/src/main.zig b/src/main.zig
deleted file mode 100644
index 3c85326..0000000
--- a/src/main.zig
+++ /dev/null
@@ -1,15 +0,0 @@
-//--------------------------------------------------------------------------------------------------
-//
-// Zig bindings for 'dear imgui' library. Easy to use, hand-crafted API with default arguments,
-// named parameters and Zig style text formatting.
-//
-//--------------------------------------------------------------------------------------------------
-pub const version = @import("std").SemanticVersion{ .major = 0, .minor = 9, .patch = 6 };
-
-pub usingnamespace @import("gui.zig");
-pub const plot = @import("plot.zig");
-pub const backend = switch (@import("zgui_options").backend) {
-    .glfw_wgpu => @import("backend_glfw_wgpu.zig"),
-    .win32_dx12 => .{}, // TODO:
-    .no_backend => .{},
-};