diff --git a/src/comms/models.py b/src/comms/models.py
index 2afdb61849..7c83c25994 100644
--- a/src/comms/models.py
+++ b/src/comms/models.py
@@ -212,53 +212,53 @@ class Msg(SharedMemoryModel):
 
     # header property (wraps db_header)
     #@property
-    def __header_get(self):
-        "Getter. Allows for value = self.message"
-        return self.db_header
-    #@message.setter
-    def __header_set(self, value):
-        "Setter. Allows for self.message = value"
-        if value:
-            self.db_header = value
-            self.save()
-    #@message.deleter
-    def __header_del(self):
-        "Deleter. Allows for del self.message"
-        self.db_header = ""
-        self.save()
-    header = property(__header_get, __header_set, __header_del)
+    #def __header_get(self):
+    #    "Getter. Allows for value = self.message"
+    #    return self.db_header
+    ##@message.setter
+    #def __header_set(self, value):
+    #    "Setter. Allows for self.message = value"
+    #    if value:
+    #        self.db_header = value
+    #        self.save()
+    ##@message.deleter
+    #def __header_del(self):
+    #    "Deleter. Allows for del self.message"
+    #    self.db_header = ""
+    #    self.save()
+    #header = property(__header_get, __header_set, __header_del)
 
-    # message property (wraps db_message)
-    #@property
-    def __message_get(self):
-        "Getter. Allows for value = self.message"
-        return self.db_message
-    #@message.setter
-    def __message_set(self, value):
-        "Setter. Allows for self.message = value"
-        self.db_message = value
-        self.save()
-    #@message.deleter
-    def __message_del(self):
-        "Deleter. Allows for del self.message"
-        self.db_message = ""
-        self.save()
-    message = property(__message_get, __message_set, __message_del)
+    ## message property (wraps db_message)
+    ##@property
+    #def __message_get(self):
+    #    "Getter. Allows for value = self.message"
+    #    return self.db_message
+    ##@message.setter
+    #def __message_set(self, value):
+    #    "Setter. Allows for self.message = value"
+    #    self.db_message = value
+    #    self.save()
+    ##@message.deleter
+    #def __message_del(self):
+    #    "Deleter. Allows for del self.message"
+    #    self.db_message = ""
+    #    self.save()
+    #message = property(__message_get, __message_set, __message_del)
 
-    # date_sent property (wraps db_date_sent)
-    #@property
-    def __date_sent_get(self):
-        "Getter. Allows for value = self.date_sent"
-        return self.db_date_sent
-    #@date_sent.setter
-    def __date_sent_set(self, value):
-        "Setter. Allows for self.date_sent = value"
-        raise Exception("You cannot edit date_sent!")
-    #@date_sent.deleter
-    def __date_sent_del(self):
-        "Deleter. Allows for del self.date_sent"
-        raise Exception("You cannot delete the date_sent property!")
-    date_sent = property(__date_sent_get, __date_sent_set, __date_sent_del)
+    ## date_sent property (wraps db_date_sent)
+    ##@property
+    #def __date_sent_get(self):
+    #    "Getter. Allows for value = self.date_sent"
+    #    return self.db_date_sent
+    ##@date_sent.setter
+    #def __date_sent_set(self, value):
+    #    "Setter. Allows for self.date_sent = value"
+    #    raise Exception("You cannot edit date_sent!")
+    ##@date_sent.deleter
+    #def __date_sent_del(self):
+    #    "Deleter. Allows for del self.date_sent"
+    #    raise Exception("You cannot delete the date_sent property!")
+    #date_sent = property(__date_sent_get, __date_sent_set, __date_sent_del)
 
     # hide_from property
     #@property
@@ -289,19 +289,19 @@ class Msg(SharedMemoryModel):
 
     # lock_storage property (wraps db_lock_storage)
     #@property
-    def __lock_storage_get(self):
-        "Getter. Allows for value = self.lock_storage"
-        return self.db_lock_storage
-    #@nick.setter
-    def __lock_storage_set(self, value):
-        """Saves the lock_storagetodate. This is usually not called directly, but through self.lock()"""
-        self.db_lock_storage = value
-        self.save()
-    #@nick.deleter
-    def __lock_storage_del(self):
-        "Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead"""
-        logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self)
-    lock_storage = property(__lock_storage_get, __lock_storage_set, __lock_storage_del)
+    #def __lock_storage_get(self):
+    #    "Getter. Allows for value = self.lock_storage"
+    #    return self.db_lock_storage
+    ##@nick.setter
+    #def __lock_storage_set(self, value):
+    #    """Saves the lock_storagetodate. This is usually not called directly, but through self.lock()"""
+    #    self.db_lock_storage = value
+    #    self.save()
+    ##@nick.deleter
+    #def __lock_storage_del(self):
+    #    "Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead"""
+    #    logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self)
+    #lock_storage = property(__lock_storage_get, __lock_storage_set, __lock_storage_del)
 
     #
     # Msg class methods
@@ -438,36 +438,36 @@ class Channel(SharedMemoryModel):
 
     # key property (wraps db_key)
     #@property
-    def key_get(self):
-        "Getter. Allows for value = self.key"
-        return self.db_key
-    #@key.setter
-    def key_set(self, value):
-        "Setter. Allows for self.key = value"
-        self.db_key = value
-        self.save()
-    #@key.deleter
-    def key_del(self):
-        "Deleter. Allows for del self.key"
-        raise Exception("You cannot delete the channel key!")
-    key = property(key_get, key_set, key_del)
+    #def key_get(self):
+    #    "Getter. Allows for value = self.key"
+    #    return self.db_key
+    ##@key.setter
+    #def key_set(self, value):
+    #    "Setter. Allows for self.key = value"
+    #    self.db_key = value
+    #    self.save()
+    ##@key.deleter
+    #def key_del(self):
+    #    "Deleter. Allows for del self.key"
+    #    raise Exception("You cannot delete the channel key!")
+    #key = property(key_get, key_set, key_del)
 
     # desc property (wraps db_desc)
     #@property
-    def desc_get(self):
-        "Getter. Allows for value = self.desc"
-        return self.db_desc
-    #@desc.setter
-    def desc_set(self, value):
-        "Setter. Allows for self.desc = value"
-        self.db_desc = value
-        self.save()
-    #@desc.deleter
-    def desc_del(self):
-        "Deleter. Allows for del self.desc"
-        self.db_desc = ""
-        self.save()
-    desc = property(desc_get, desc_set, desc_del)
+    #def desc_get(self):
+    #    "Getter. Allows for value = self.desc"
+    #    return self.db_desc
+    ##@desc.setter
+    #def desc_set(self, value):
+    #    "Setter. Allows for self.desc = value"
+    #    self.db_desc = value
+    #    self.save()
+    ##@desc.deleter
+    #def desc_del(self):
+    #    "Deleter. Allows for del self.desc"
+    #    self.db_desc = ""
+    #    self.save()
+    #desc = property(desc_get, desc_set, desc_del)
 
     # aliases property
     #@property
@@ -492,36 +492,36 @@ class Channel(SharedMemoryModel):
 
     # keep_log property (wraps db_keep_log)
     #@property
-    def keep_log_get(self):
-        "Getter. Allows for value = self.keep_log"
-        return self.db_keep_log
-    #@keep_log.setter
-    def keep_log_set(self, value):
-        "Setter. Allows for self.keep_log = value"
-        self.db_keep_log = value
-        self.save()
-    #@keep_log.deleter
-    def keep_log_del(self):
-        "Deleter. Allows for del self.keep_log"
-        self.db_keep_log = False
-        self.save()
-    keep_log = property(keep_log_get, keep_log_set, keep_log_del)
+    #def keep_log_get(self):
+    #    "Getter. Allows for value = self.keep_log"
+    #    return self.db_keep_log
+    ##@keep_log.setter
+    #def keep_log_set(self, value):
+    #    "Setter. Allows for self.keep_log = value"
+    #    self.db_keep_log = value
+    #    self.save()
+    ##@keep_log.deleter
+    #def keep_log_del(self):
+    #    "Deleter. Allows for del self.keep_log"
+    #    self.db_keep_log = False
+    #    self.save()
+    #keep_log = property(keep_log_get, keep_log_set, keep_log_del)
 
     # lock_storage property (wraps db_lock_storage)
     #@property
-    def lock_storage_get(self):
-        "Getter. Allows for value = self.lock_storage"
-        return self.db_lock_storage
-    #@nick.setter
-    def lock_storage_set(self, value):
-        """Saves the lock_storagetodate. This is usually not called directly, but through self.lock()"""
-        self.db_lock_storage = value
-        self.save()
-    #@nick.deleter
-    def lock_storage_del(self):
-        "Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead"""
-        logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self)
-    lock_storage = property(lock_storage_get, lock_storage_set, lock_storage_del)
+    #def lock_storage_get(self):
+    #    "Getter. Allows for value = self.lock_storage"
+    #    return self.db_lock_storage
+    ##@nick.setter
+    #def lock_storage_set(self, value):
+    #    """Saves the lock_storagetodate. This is usually not called directly, but through self.lock()"""
+    #    self.db_lock_storage = value
+    #    self.save()
+    ##@nick.deleter
+    #def lock_storage_del(self):
+    #    "Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead"""
+    #    logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self)
+    #lock_storage = property(lock_storage_get, lock_storage_set, lock_storage_del)
 
     class Meta:
         "Define Django meta options"
diff --git a/src/players/models.py b/src/players/models.py
index 0a56082d68..47f94d4c3e 100644
--- a/src/players/models.py
+++ b/src/players/models.py
@@ -27,7 +27,7 @@ from src.typeclasses.models import TypedObject, TagHandler, NickHandler, AliasHa
 from src.commands.cmdsethandler import CmdSetHandler
 from src.commands import cmdhandler
 from src.utils import utils
-from src.utils.utils import to_str
+from src.utils.utils import to_str, make_iter
 
 from django.utils.translation import ugettext as _
 
@@ -146,20 +146,18 @@ class PlayerDB(TypedObject, AbstractUser):
     #@property
     def cmdset_storage_get(self):
         "Getter. Allows for value = self.name. Returns a list of cmdset_storage."
-        if _GA(self, "db_cmdset_storage"):
-            return [path.strip() for path  in _GA(self, "db_cmdset_storage").split(',')]
-        return []
+        storage = _GA(self, "db_cmdset_storage")
+        # we need to check so storage is not None
+        return [path.strip() for path  in storage.split(',')] if storage else []
     #@cmdset_storage.setter
     def cmdset_storage_set(self, value):
         "Setter. Allows for self.name = value. Stores as a comma-separated string."
-        if utils.is_iter(value):
-            value = ",".join([str(val).strip() for val in value])
-        _SA(self, "db_cmdset_storage", value)
+        _SA(self, "db_cmdset_storage", ",".join(str(val).strip() for val in make_iter(value)))
         _GA(self, "save")()
     #@cmdset_storage.deleter
     def cmdset_storage_del(self):
         "Deleter. Allows for del self.name"
-        _SA(self, "db_cmdset_storage", "")
+        _SA(self, "db_cmdset_storage", None)
         _GA(self, "save")()
     cmdset_storage = property(cmdset_storage_get, cmdset_storage_set, cmdset_storage_del)
 
@@ -195,37 +193,39 @@ class PlayerDB(TypedObject, AbstractUser):
 
     # name property (wraps self.user.username)
     #@property
-    def __name_get(self):
-        "Getter. Allows for value = self.name"
-        return self.username
-        #name = get_prop_cache(self, "_name")
-        #if not name:
-        #    name = _GA(self,"user").username
-        #    set_prop_cache(self, "_name", name)
-        #return name
-    #@name.setter
-    def __name_set(self, value):
-        "Setter. Allows for player.name = newname"
-        self.username = value
-        #_GA(self, "user").username = value
-        #_GA(self, "user").save()
-        #set_prop_cache(self, "_name", value)
-    #@name.deleter
-    def __name_del(self):
-        "Deleter. Allows for del self.name"
-        raise Exception("Player name cannot be deleted!")
-    name = property(__name_get, __name_set, __name_del)
-    key = property(__name_get, __name_set, __name_del)
+    #def __name_get(self):
+    #    "Getter. Allows for value = self.name"
+    #    return self.username
+    #    #name = get_prop_cache(self, "_name")
+    #    #if not name:
+    #    #    name = _GA(self,"user").username
+    #    #    set_prop_cache(self, "_name", name)
+    #    #return name
+    ##@name.setter
+    #def __name_set(self, value):
+    #    "Setter. Allows for player.name = newname"
+    #    _SA(self, "username", value)
+
+    #    #_GA(self, "user").username = value
+    #    #_GA(self, "user").save()
+    #    #set_prop_cache(self, "_name", value)
+    ##@name.deleter
+    #def __name_del(self):
+    #    "Deleter. Allows for del self.name"
+    #    raise Exception("Player name cannot be deleted!")
+    def __username_get(self):
+        return _GA(self, "username")
+    def __username_set(self, value):
+        _SA(self, "username", value)
+    def __username_del(self):
+        _DA(self, "username", value)
+    name = property(__username_get, __username_set, __username_del)
+    key = property(__username_get, __username_set, __username_del)
 
     #@property
     def __uid_get(self):
         "Getter. Retrieves the user id"
         return self.id
-        #uid = get_prop_cache(self, "_uid")
-        #if not uid:
-        #    uid = _GA(self, "user").id
-        #    set_prop_cache(self, "_uid", uid)
-        #return uid
     def __uid_set(self, value):
         raise Exception("User id cannot be set!")
     def __uid_del(self):
diff --git a/src/scripts/models.py b/src/scripts/models.py
index 8d844d8c36..ae6924b996 100644
--- a/src/scripts/models.py
+++ b/src/scripts/models.py
@@ -121,122 +121,122 @@ class ScriptDB(TypedObject):
 
     # desc property (wraps db_desc)
     #@property
-    def __desc_get(self):
-        "Getter. Allows for value = self.desc"
-        return self.db_desc
-    #@desc.setter
-    def __desc_set(self, value):
-        "Setter. Allows for self.desc = value"
-        self.db_desc = value
-        self.save()
-    #@desc.deleter
-    def __desc_del(self):
-        "Deleter. Allows for del self.desc"
-        self.db_desc = ""
-        self.save()
-    desc = property(__desc_get, __desc_set, __desc_del)
+    #def __desc_get(self):
+    #    "Getter. Allows for value = self.desc"
+    #    return self.db_desc
+    ##@desc.setter
+    #def __desc_set(self, value):
+    #    "Setter. Allows for self.desc = value"
+    #    self.db_desc = value
+    #    self.save()
+    ##@desc.deleter
+    #def __desc_del(self):
+    #    "Deleter. Allows for del self.desc"
+    #    self.db_desc = ""
+    #    self.save()
+    #desc = property(__desc_get, __desc_set, __desc_del)
 
     # obj property (wraps db_obj)
     #@property
-    def __obj_get(self):
-        "Getter. Allows for value = self.obj"
-        return self.db_obj
-    #@obj.setter
-    def __obj_set(self, value):
-        "Setter. Allows for self.obj = value"
-        self.db_obj = value
-        self.save()
-    #@obj.deleter
-    def __obj_del(self):
-        "Deleter. Allows for del self.obj"
-        self.db_obj = None
-        self.save()
-    obj = property(__obj_get, __obj_set, __obj_del)
+    #def __obj_get(self):
+    #    "Getter. Allows for value = self.obj"
+    #    return self.db_obj
+    ##@obj.setter
+    #def __obj_set(self, value):
+    #    "Setter. Allows for self.obj = value"
+    #    self.db_obj = value
+    #    self.save()
+    ##@obj.deleter
+    #def __obj_del(self):
+    #    "Deleter. Allows for del self.obj"
+    #    self.db_obj = None
+    #    self.save()
+    #obj = property(__obj_get, __obj_set, __obj_del)
 
     # interval property (wraps db_interval)
     #@property
-    def __interval_get(self):
-        "Getter. Allows for value = self.interval"
-        return self.db_interval
-    #@interval.setter
-    def __interval_set(self, value):
-        "Setter. Allows for self.interval = value"
-        self.db_interval = int(value)
-        self.save()
-    #@interval.deleter
-    def __interval_del(self):
-        "Deleter. Allows for del self.interval"
-        self.db_interval = 0
-        self.save()
-    interval = property(__interval_get, __interval_set, __interval_del)
+    #def __interval_get(self):
+    #    "Getter. Allows for value = self.interval"
+    #    return self.db_interval
+    ##@interval.setter
+    #def __interval_set(self, value):
+    #    "Setter. Allows for self.interval = value"
+    #    self.db_interval = int(value)
+    #    self.save()
+    ##@interval.deleter
+    #def __interval_del(self):
+    #    "Deleter. Allows for del self.interval"
+    #    self.db_interval = 0
+    #    self.save()
+    #interval = property(__interval_get, __interval_set, __interval_del)
 
     # start_delay property (wraps db_start_delay)
     #@property
-    def __start_delay_get(self):
-        "Getter. Allows for value = self.start_delay"
-        return self.db_start_delay
-    #@start_delay.setter
-    def __start_delay_set(self, value):
-        "Setter. Allows for self.start_delay = value"
-        self.db_start_delay = value
-        self.save()
-    #@start_delay.deleter
-    def __start_delay_del(self):
-        "Deleter. Allows for del self.start_delay"
-        self.db_start_delay = False
-        self.save()
-    start_delay = property(__start_delay_get, __start_delay_set, __start_delay_del)
+    #def __start_delay_get(self):
+    #    "Getter. Allows for value = self.start_delay"
+    #    return self.db_start_delay
+    ##@start_delay.setter
+    #def __start_delay_set(self, value):
+    #    "Setter. Allows for self.start_delay = value"
+    #    self.db_start_delay = value
+    #    self.save()
+    ##@start_delay.deleter
+    #def __start_delay_del(self):
+    #    "Deleter. Allows for del self.start_delay"
+    #    self.db_start_delay = False
+    #    self.save()
+    #start_delay = property(__start_delay_get, __start_delay_set, __start_delay_del)
 
     # repeats property (wraps db_repeats)
     #@property
-    def __repeats_get(self):
-        "Getter. Allows for value = self.repeats"
-        return self.db_repeats
-    #@repeats.setter
-    def __repeats_set(self, value):
-        "Setter. Allows for self.repeats = value"
-        self.db_repeats = int(value)
-        self.save()
-    #@repeats.deleter
-    def __repeats_del(self):
-        "Deleter. Allows for del self.repeats"
-        self.db_repeats = 0
-        self.save()
-    repeats = property(__repeats_get, __repeats_set, __repeats_del)
+    #def __repeats_get(self):
+    #    "Getter. Allows for value = self.repeats"
+    #    return self.db_repeats
+    ##@repeats.setter
+    #def __repeats_set(self, value):
+    #    "Setter. Allows for self.repeats = value"
+    #    self.db_repeats = int(value)
+    #    self.save()
+    ##@repeats.deleter
+    #def __repeats_del(self):
+    #    "Deleter. Allows for del self.repeats"
+    #    self.db_repeats = 0
+    #    self.save()
+    #repeats = property(__repeats_get, __repeats_set, __repeats_del)
 
     # persistent property (wraps db_persistent)
     #@property
-    def __persistent_get(self):
-        "Getter. Allows for value = self.persistent"
-        return self.db_persistent
-    #@persistent.setter
-    def __persistent_set(self, value):
-        "Setter. Allows for self.persistent = value"
-        self.db_persistent = value
-        self.save()
-    #@persistent.deleter
-    def __persistent_del(self):
-        "Deleter. Allows for del self.persistent"
-        self.db_persistent = False
-        self.save()
-    persistent = property(__persistent_get, __persistent_set, __persistent_del)
+    #def __persistent_get(self):
+    #    "Getter. Allows for value = self.persistent"
+    #    return self.db_persistent
+    ##@persistent.setter
+    #def __persistent_set(self, value):
+    #    "Setter. Allows for self.persistent = value"
+    #    self.db_persistent = value
+    #    self.save()
+    ##@persistent.deleter
+    #def __persistent_del(self):
+    #    "Deleter. Allows for del self.persistent"
+    #    self.db_persistent = False
+    #    self.save()
+    #persistent = property(__persistent_get, __persistent_set, __persistent_del)
 
     # is_active property (wraps db_is_active)
     #@property
-    def __is_active_get(self):
-        "Getter. Allows for value = self.is_active"
-        return self.db_is_active
-    #@is_active.setter
-    def __is_active_set(self, value):
-        "Setter. Allows for self.is_active = value"
-        self.db_is_active = value
-        self.save()
-    #@is_active.deleter
-    def __is_active_del(self):
-        "Deleter. Allows for del self.is_active"
-        self.db_is_active = False
-        self.save()
-    is_active = property(__is_active_get, __is_active_set, __is_active_del)
+    #def __is_active_get(self):
+    #    "Getter. Allows for value = self.is_active"
+    #    return self.db_is_active
+    ##@is_active.setter
+    #def __is_active_set(self, value):
+    #    "Setter. Allows for self.is_active = value"
+    #    self.db_is_active = value
+    #    self.save()
+    ##@is_active.deleter
+    #def __is_active_del(self):
+    #    "Deleter. Allows for del self.is_active"
+    #    self.db_is_active = False
+    #    self.save()
+    #is_active = property(__is_active_get, __is_active_set, __is_active_del)
 
     #
     #