diff --git a/src/net/torvald/spriteanimation/HasAssembledSprite.kt b/src/net/torvald/spriteanimation/HasAssembledSprite.kt
index 9c0e53202..787e3e4cb 100644
--- a/src/net/torvald/spriteanimation/HasAssembledSprite.kt
+++ b/src/net/torvald/spriteanimation/HasAssembledSprite.kt
@@ -2,9 +2,9 @@ package net.torvald.spriteanimation
 
 import com.badlogic.gdx.graphics.Texture
 import com.badlogic.gdx.graphics.g2d.TextureRegion
+import net.torvald.terrarum.gameitems.GameItem
 import net.torvald.terrarum.spriteassembler.ADProperties
 import net.torvald.terrarum.spriteassembler.AssembleSheetPixmap
-import net.torvald.terrarum.gameitems.GameItem
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 
 /**
diff --git a/src/net/torvald/spriteanimation/SpriteAnimation.kt b/src/net/torvald/spriteanimation/SpriteAnimation.kt
index 37b0dffed..3aaa5921b 100644
--- a/src/net/torvald/spriteanimation/SpriteAnimation.kt
+++ b/src/net/torvald/spriteanimation/SpriteAnimation.kt
@@ -17,7 +17,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
  */
 class SpriteAnimation(@Transient val parentActor: ActorWithBody) : Disposable {
 
-    lateinit var textureRegion: TextureRegionPack; private set
+    internal lateinit var textureRegion: TextureRegionPack; private set
 
     var currentFrame = 0
     var currentRow = 0
diff --git a/src/net/torvald/terrarum/console/CommandDict.kt b/src/net/torvald/terrarum/console/CommandDict.kt
index 9e4a18571..f78129ed7 100644
--- a/src/net/torvald/terrarum/console/CommandDict.kt
+++ b/src/net/torvald/terrarum/console/CommandDict.kt
@@ -3,8 +3,6 @@ package net.torvald.terrarum.console
 import net.torvald.terrarum.App.printdbg
 import net.torvald.terrarum.App.printdbgerr
 import net.torvald.terrarum.ModMgr
-import java.io.BufferedReader
-import java.io.InputStreamReader
 
 /**
  * Created by minjaesong on 2016-01-15.
@@ -46,7 +44,12 @@ object CommandDict {
 
                 commandsList.forEach { commandName ->
                     val canonicalName = "$packageConsole.$commandName"
-                    val it = Class.forName(canonicalName)
+                    val it = ModMgr.moduleClassloader[modName].let {
+                        if (it != null)
+                            it.loadClass(canonicalName)
+                        else
+                            Class.forName(canonicalName)
+                    }
 
                     printdbg(this, "> Trying to instantiate ${it.canonicalName}")
 
diff --git a/src/net/torvald/terrarum/console/Echo.kt b/src/net/torvald/terrarum/console/Echo.kt
index 23c63b678..4dda90cf4 100644
--- a/src/net/torvald/terrarum/console/Echo.kt
+++ b/src/net/torvald/terrarum/console/Echo.kt
@@ -1,14 +1,13 @@
 package net.torvald.terrarum.console
 
-import net.torvald.terrarum.*
 import net.torvald.terrarum.App.csi0
 import net.torvald.terrarum.App.csiG
-import net.torvald.terrarum.ui.ConsoleWindow
+import net.torvald.terrarum.INGAME
 
 /**
  * Created by minjaesong on 2016-01-16.
  */
-internal object Echo : ConsoleCommand {
+object Echo : ConsoleCommand {
     override fun execute(args: Array<String>) {
         val argsWoHeader = Array<String>(args.size - 1, {it -> args[it + 1]})
         argsWoHeader.forEach { execute(it) }
diff --git a/src/net/torvald/terrarum/console/EchoError.kt b/src/net/torvald/terrarum/console/EchoError.kt
index 351db9e73..0bed28938 100644
--- a/src/net/torvald/terrarum/console/EchoError.kt
+++ b/src/net/torvald/terrarum/console/EchoError.kt
@@ -7,7 +7,7 @@ import net.torvald.terrarum.ccR
  * Created by minjaesong on 2016-04-25.
  */
 @ConsoleAlias("error")
-internal object EchoError : ConsoleCommand {
+object EchoError : ConsoleCommand {
     override fun execute(args: Array<String>) {
         val argsWoHeader = Array(args.size - 1) { args[it + 1] }
         argsWoHeader.forEach { execute(it) }