diff --git a/Makefile b/Makefile
index dab2ec2..4e38e45 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,8 @@ ifeq ($(OS), Windows_NT)
 	PLATFORM_LIBS := -municode -mconsole 
 	
 ifeq ($(CI2_GUI),1)
+	PLATFORM_LIBS := $(filter-out -mconsole, $(PLATFORM_LIBS))
 	PLATFORM_LIBS += -mwindows
-	PLATFORM_LIBS -= -mconsole
 	PLATFORM_FLAGS += -DCI2_GUI
 endif
 	
@@ -39,7 +39,6 @@ else
 	PLATFORM_FLAGS := -D LINUX
 	PLATFORM_LIBS  := 
 ifeq ($(CI2_GUI),1)
-	
 	PLATFORM_FLAGS += -DCI2_GUI
 	PLATFORM_LIBS += -lX11
 endif
diff --git a/include/ci2.h b/include/ci2.h
index 39628b0..938d22e 100644
--- a/include/ci2.h
+++ b/include/ci2.h
@@ -32,7 +32,7 @@ SOFTWARE.
             extern int WINAPI ci2_wgui( 
                     HINSTANCE hInstance, 
                     HINSTANCE hPrevInstance, 
-                    LPSTR lpCmdLine, 
+                    LPWSTR lpCmdLine, 
                     int nCmdShow);
     #else 
         #include <io.h>
diff --git a/src/win32_ci2.c b/src/win32_ci2.c
index 5f3c715..6959d3b 100644
--- a/src/win32_ci2.c
+++ b/src/win32_ci2.c
@@ -22,10 +22,10 @@ SOFTWARE.
  * --------------------------------------------------------------------------*/
 #include "../include/ci2.h"
 
-int WINAPI ci2_wWinMain(
+int WINAPI ci2_wgui(
         HINSTANCE hInstance, 
         HINSTANCE hPrevInstance, 
-        LPSTR pCmdLine, 
+        LPWSTR pCmdLine, 
         int nCmdShow) {
     
     UNUSED(hInstance);
@@ -41,7 +41,7 @@ int WINAPI ci2_wWinMain(
         wprintf(L"GUI but allocated a console\n");
     }
 
-    static ci2_sys_char *ci2_window_title = "Win32-GUI Window Title";
+    static ci2_sys_char *ci2_window_title = L"Win32-GUI Window Title";
     CI2_Window* window = ci2_create_window(ci2_window_title, 800, 600);
     if (!window) return 1;
 
@@ -60,14 +60,14 @@ int WINAPI ci2_wWinMain(
 
 }
 
-int WINAPI ci2_wmain(int argc, ci2_sys_char *wargv[]) {
+int WINAPI ci2_wcli(int argc, ci2_sys_char *wargv[]) {
     
     wprintf(L"Console present. argc=%d\n", argc);
     UNUSED(wargv);
 
     if (!ci2_init()) return 1;
 
-    static ci2_sys_char *ci2_window_title = "Win32-CLI Window Title";
+    static ci2_sys_char *ci2_window_title = L"Win32-CLI Window Title";
     CI2_Window* window = ci2_create_window(ci2_window_title, 800, 600);
     if (!window) return 1;
 
diff --git a/tests/01_main.c b/tests/01_main.c
index 07c62be..4ec72ed 100644
--- a/tests/01_main.c
+++ b/tests/01_main.c
@@ -21,11 +21,12 @@ SOFTWARE.
 
  * --------------------------------------------------------------------------*/
 #define DEBUG
+#define GUI_DEBUG_CLOSE 
 #include "../include/ci2.h"
 
 #ifdef CI2_WINDOWS
     #ifdef CI2_GUI
-        int WINAPI WinMain(
+        int WINAPI wWinMain(
                 HINSTANCE hInstance, 
                 HINSTANCE hPrevInstance, 
                 LPSTR lpCmdLine,