8 files changed, 31 insertions, 26 deletions
diff --git a/src/lua/bit/luaopen_bit.cpp b/src/lua/bit/luaopen_bit.cpp
index 9610a84..9520909 100644
--- a/src/lua/bit/luaopen_bit.cpp
+++ b/src/lua/bit/luaopen_bit.cpp
@@ -71,8 +71,6 @@ namespace lua
         { "bRs", l_rshift },
         { "bInc", l_include },
 
-        // , offset
-
         { 0, 0 }
     };
 
diff --git a/src/lua/embed/boot.lua b/src/lua/embed/boot.lua
index 6869ac8..e649737 100644
--- a/src/lua/embed/boot.lua
+++ b/src/lua/embed/boot.lua
@@ -1,4 +1,3 @@
-
 jin._argv[2] = jin._argv[2] or '.'
 jin.filesystem.init()
 jin.filesystem.mount(jin._argv[2])
@@ -28,13 +27,14 @@ local function safecall(func, ...)
     if func then 
         func(...)
     end
-end 
+end
 
 function jin.core.run()
-    safecall(jin.core.load)
+    safecall(jin.core.onLoad)
     local previous = jin.time.second()
     local SEC_PER_UPDATE = 1 / conf.fps
     local dt = SEC_PER_UPDATE
+    local running = true
     while(jin.core.running()) do
         for _, e in pairs(jin.event.poll()) do 
             if e.type == "keydown" then 
@@ -43,10 +43,10 @@ function jin.core.run()
                 jin.keyboard.set(e.key, false)
             end
             safecall(jin.core.onEvent, e)
+            running = jin.core.running()
+            if not running then break end 
         end
-        if not jin.core.running() then 
-            break 
-        end 
+        if not running then break end 
 
         safecall(jin.core.onUpdate, dt)
 
@@ -88,7 +88,7 @@ local function onError(msg)
     end
 end
 
-local function main() 
+local function boot() 
     if jin.filesystem.exist("main.lua") then 
         -- require main game script
         xpcall(function() require"main" end, onError)
@@ -115,4 +115,4 @@ local function main()
     jin.core.quit()
 end 
 
-main()
+boot()
diff --git a/src/lua/graphics/Canvas.h b/src/lua/graphics/Canvas.h
index d2c9287..4494db4 100644
--- a/src/lua/graphics/Canvas.h
+++ b/src/lua/graphics/Canvas.h
@@ -44,6 +44,7 @@ namespace graphics
         static void unbind();
 
     private:
+		Canvas() {}
         ~Canvas()
         {
             delete canvas;
diff --git a/src/lua/graphics/Image.h b/src/lua/graphics/Image.h
index d96f69d..0d1d010 100644
--- a/src/lua/graphics/Image.h
+++ b/src/lua/graphics/Image.h
@@ -20,19 +20,23 @@ namespace graphics
         {
             return image->getWidth();
         }
+
         int getHeight()
         {
             return image->getHeight();
         }
-        void setAnchor(int x, int y)
+        
+		void setAnchor(int x, int y)
         {
             image->setAnchor(x, y);
         }
-        jin::graphics::color getPixel(int x, int y)
+        
+		jin::graphics::color getPixel(int x, int y)
         {
             return image->getPixel(x, y);
         }
-        inline const jin::graphics::Texture* getRawImage() const
+        
+		inline const jin::graphics::Texture* getRawImage() const
         {
             return image;
         }
@@ -43,6 +47,8 @@ namespace graphics
         }
 
     private:
+		Image() {};
+
         ~Image()
         {
             delete image;
diff --git a/src/lua/graphics/JSL.h b/src/lua/graphics/JSL.h
index 62aa638..af6c54d 100644
--- a/src/lua/graphics/JSL.h
+++ b/src/lua/graphics/JSL.h
@@ -74,6 +74,8 @@ namespace graphics
 
         static JSLProgram* currentJSLProgram;
 
+		JSLProgram() {}
+
         ~JSLProgram()
         {
             delete jslprogram;
diff --git a/src/lua/luaopen_types.h b/src/lua/luaopen_types.h
index b32d849..a685407 100644
--- a/src/lua/luaopen_types.h
+++ b/src/lua/luaopen_types.h
@@ -2,20 +2,20 @@
 #define __JIN_M_TYPES_H
 
 // graphics module
-#define JIN_GRAPHICS_IMAGE     "JIN_GRAPHICS_IMAGE"
-#define JIN_GRAPHICS_SHADER    "JIN_GRAPHICS_SHADER"
-#define JIN_GRAPHICS_CANVAS    "JIN_GRAPHICS_CANVAS"
-#define JIN_GRAPHICS_FONT      "JIN_GRAPHICS_FONT"
+#define JIN_GRAPHICS_IMAGE     "jin.graphics.Image"
+#define JIN_GRAPHICS_SHADER    "jin.graphics.Shader"
+#define JIN_GRAPHICS_CANVAS    "jin.graphics.Canvas"
+#define JIN_GRAPHICS_FONT      "jin.graphics.Font"
 
 // audio module
-#define JIN_AUDIO_SOURCE       "JIN_AUDIO_SOURCE"
+#define JIN_AUDIO_SOURCE       "jin.Audio.Source"
 
 // thread module 
-#define JIN_THREAD_THREAD      "JIN_THREAD_THREAD"
+#define JIN_THREAD_THREAD      "jin.thread.Thread"
 
 // network module 
-#define JIN_NETWORK_SOCKET     "JIN_NETWORK_SOCKET"
-#define JIN_NETWORK_BUFFER     "JIN_NETWORK_BUFFER"
+#define JIN_NETWORK_SOCKET     "jin.net.Socket"
+#define JIN_NETWORK_BUFFER     "jin.net.Buffer"
 
 namespace jin 
 {
@@ -45,9 +45,7 @@ namespace lua
         }
     
     protected:
-        virtual ~Object() = 0
-        {
-        }
+		virtual ~Object() = 0 {}
 
     private: 
         // reference count
diff --git a/src/lua/thread/luaopen_Thread.cpp b/src/lua/thread/luaopen_Thread.cpp
index b6fb33b..30eb343 100644
--- a/src/lua/thread/luaopen_Thread.cpp
+++ b/src/lua/thread/luaopen_Thread.cpp
@@ -172,7 +172,7 @@ namespace lua
     static int l_remove(lua_State* L)
     {
         Thread* t = checkThread(L);
-        int slot = luax_checkinteger(L, 1);
+        int slot = luax_checkinteger(L, 2);
         t->remove(slot);
         return 0;
     }
diff --git a/src/lua/thread/luaopen_thread.cpp b/src/lua/thread/luaopen_thread.cpp
index b6fb33b..30eb343 100644
--- a/src/lua/thread/luaopen_thread.cpp
+++ b/src/lua/thread/luaopen_thread.cpp
@@ -172,7 +172,7 @@ namespace lua
     static int l_remove(lua_State* L)
     {
         Thread* t = checkThread(L);
-        int slot = luax_checkinteger(L, 1);
+        int slot = luax_checkinteger(L, 2);
         t->remove(slot);
         return 0;
     }