diff --git a/lib/core/common.py b/lib/core/common.py
index 7fb8c8a5f..52ea24d12 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -380,9 +380,9 @@ def dataToOutFile(data):
 
     rFile = filePathToString(conf.rFile)
     rFilePath = "%s%s%s" % (conf.filePath, os.sep, rFile)
-    rFileFP = codecs.open(rFilePath, "wb", conf.dataEncoding)
+    rFileFP = codecs.open(rFilePath, "wb")
 
-    rFileFP.write(utf8decode(data))
+    rFileFP.write(data)
     rFileFP.flush()
     rFileFP.close()
 
@@ -421,7 +421,7 @@ def fileToStr(fileName):
     @rtype: C{str}
     """
 
-    filePointer = codecs.open(fileName, "rb", conf.dataEncoding)
+    filePointer = codecs.open(fileName, "rb")
     fileText = filePointer.read()
 
     return fileText.replace("    ", "").replace("\t", "").replace("\r", "").replace("\n", " ")
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index 4198d588b..adcd0f896 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -92,7 +92,7 @@ optDict = {
                                "getCurrentDb":      ("boolean", "Databases"),
                                "isDba":             "boolean",
                                "getUsers":          ("boolean", "Users"),
-                               "getPasswordHashes": ("boolean", "Hashes"),
+                               "getPasswordHashes": ("boolean", "Passwords"),
                                "getPrivileges":     ("boolean", "Privileges"),
                                "getRoles":          ("boolean", "Roles"),
                                "getDbs":            ("boolean", "Databases"),
diff --git a/lib/core/target.py b/lib/core/target.py
index 12a59c277..f503b3183 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -127,7 +127,7 @@ def __setOutputResume():
             __url_cache = set()
             __expression_cache = {}
 
-            for line in readSessionFP.readlines(): #xreadlines doesn't return unicode strings when codec.open used
+            for line in readSessionFP.readlines(): # xreadlines doesn't return unicode strings when codec.open() is used
                 if line.count("][") == 4:
                     line = line.split("][")
 
@@ -142,7 +142,7 @@ def __setOutputResume():
                     if url[0] == "[":
                         url = url[1:]
     
-                    value = value.rstrip('\r\n') #strips both chars independently
+                    value = value.rstrip('\r\n') # Strips both chars independently
 
                     if url not in ( conf.url, conf.hostname ):
                         continue
diff --git a/lib/parse/configfile.py b/lib/parse/configfile.py
index 4c0b5b855..caac429c1 100644
--- a/lib/parse/configfile.py
+++ b/lib/parse/configfile.py
@@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License along
 with sqlmap; if not, write to the Free Software Foundation, Inc., 51
 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 """
+
 import codecs
 
 from ConfigParser import NoSectionError
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
index 3c52efa29..5d153138e 100644
--- a/lib/techniques/blind/inference.py
+++ b/lib/techniques/blind/inference.py
@@ -414,7 +414,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
 
                         break
                 elif commonCharset:
-                    # TODO: this part does not seem to work yet
                     val = getChar(index, commonCharset, False)
 
                 # If we had no luck with singleValue and common charset,
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index eaf1ed635..9ae3c1354 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -775,7 +775,7 @@ class Enumeration:
                     plusOne = True
                 else:
                     plusOne = False
-                indexRange = getRange(count)
+                indexRange = getRange(count, plusOne=plusOne)
 
                 for index in indexRange:
                     if kb.dbms in ("SQLite", "Firebird"):