diff --git a/src/base/bt/sql.py b/src/base/bt/sql.py
index c05684ae..c25dad4a 100644
--- a/src/base/bt/sql.py
+++ b/src/base/bt/sql.py
@@ -39,20 +39,25 @@ class Statement():
 	def __init__(self):
 		self.statement = ""
 		self.con = connect()
+		self.commit = True
 
 	def __del__(self):
 		self.con.close()
 
-	def commit(self):
+	def commitdb(self):
 		self.con.commit()
 
 	def execute(self,vals=None):
 		if self.statement == "":
 			return
 		if vals==None:
-			return self.con.execute(self.statement)
+			result = self.con.execute(self.statement)
 		else:
-			return self.con.execute(self.statement,vals)
+			result = self.con.execute(self.statement,vals)
+
+		if self.commit == True:
+			self.commitdb()
+		return result
 
 
 
@@ -81,6 +86,7 @@ class CTable(Statement):
 class Select(Statement):
 	def __init__(self,What,From,Where=None):
 		Statement.__init__(self)
+		self.commit = False
 		self.What = What
 		self.From = From
 		self.Where = Where
@@ -112,7 +118,18 @@ class Insert(Statement):
 				qs+=","
 			qs+="?"
 		self.statement+=qs + ")"
-		#write(self.statement)
-		#write(self.values)
 		Statement.execute(self, self.values)
 
+
+
+class Remove(Statement):
+	def __init__(self,table,where=""):
+		Statement.__init__(self)
+		self.table = table
+		self.where = where
+
+	def execute(self):
+		self.statement = "DELETE FROM " + self.table
+		if not self.where=="":
+			self.statement += " WHERE "+self.where
+		Statement.execute(self)
diff --git a/src/core/cli.py b/src/core/cli.py
index bba89bf6..19b39fbd 100644
--- a/src/core/cli.py
+++ b/src/core/cli.py
@@ -50,6 +50,7 @@ class Plugin(plugin.Plugin):
 	def run(self,args):
 		if args==None or len(args)<1:
 			write(self.usage)
+			return
 
 		if args[0]=="prompt":
 			settings.set("prompt",args[1]+" ")
diff --git a/src/core/sql.py b/src/core/sql.py
index 3b3a214a..178a06ad 100644
--- a/src/core/sql.py
+++ b/src/core/sql.py
@@ -34,7 +34,6 @@ class Plugin(plugin.Plugin):
 		ins.addval("one")
 		ins.addval(1)
 		ins.execute()
-		ins.commit()
 
 
 	def run(self, args=None):