diff --git a/slife-sys/src/main/java/com/slife/controller/SysMenuController.java b/slife-sys/src/main/java/com/slife/controller/SysMenuController.java
index 75d2688..f108e98 100644
--- a/slife-sys/src/main/java/com/slife/controller/SysMenuController.java
+++ b/slife-sys/src/main/java/com/slife/controller/SysMenuController.java
@@ -32,8 +32,7 @@ import java.util.Map;
 @RequestMapping(value = "/sys/menu")
 public class SysMenuController extends BaseController{
 
-    @Autowired
-    private SysRoleService sysRoleService;
+
     @Autowired
     private ISysMenuService sysMenuService;
 
@@ -93,6 +92,12 @@ public class SysMenuController extends BaseController{
         return "redirect:/sys/menu";
     }
 
+
+    /**
+     * 设置为不可用
+     * @param id
+     * @return
+     */
     @PostMapping(value="disable/{id}")
     @ResponseBody
     public ReturnDTO disable(@PathVariable("id") Long id){
diff --git a/slife-sys/src/main/java/com/slife/controller/SysRoleController.java b/slife-sys/src/main/java/com/slife/controller/SysRoleController.java
index 1166fb6..741ecb7 100644
--- a/slife-sys/src/main/java/com/slife/controller/SysRoleController.java
+++ b/slife-sys/src/main/java/com/slife/controller/SysRoleController.java
@@ -1,13 +1,18 @@
 package com.slife.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.slife.annotation.SLog;
 import com.slife.base.controller.BaseController;
+import com.slife.base.entity.ReturnDTO;
 import com.slife.base.vo.DataTable;
 import com.slife.entity.SysRole;
 import com.slife.entity.SysUser;
+import com.slife.service.ISysMenuService;
 import com.slife.service.impl.SysRoleService;
+import com.slife.util.ReturnDTOUtil;
 import com.slife.util.ServletUtils;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -15,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import java.util.Map;
 
 /**
@@ -29,6 +35,8 @@ import java.util.Map;
 public class SysRoleController extends BaseController {
     @Autowired
     private SysRoleService sysRoleService;
+    @Autowired
+    private ISysMenuService sysMenuService;
 
     /**
      * 进入系统角色列表
@@ -38,12 +46,11 @@ public class SysRoleController extends BaseController {
      */
     @GetMapping(value = "")
     public String list(Model model, HttpServletRequest request) {
-        model.addAttribute("url", request.getContextPath()+"/sys/role/");
+        model.addAttribute("url", request.getContextPath() + "/sys/role/");
         return "role/list";
     }
 
 
-
     @SLog("获角色列表")
     @ApiOperation(value = "获角色列表", notes = "获角色列表:使用约定的DataTable")
     @PostMapping(value = "/list")
@@ -51,4 +58,96 @@ public class SysRoleController extends BaseController {
     public DataTable<SysRole> list(@RequestBody DataTable dt, ServletRequest request) {
         return sysRoleService.pageSearch(dt);
     }
+
+
+    /**
+     * 进入创建角色界面
+     *
+     * @param model
+     * @return
+     */
+    @GetMapping(value = "/insert")
+    public String create(Model model, HttpServletRequest request) {
+        SysRole sysRole = new SysRole();
+        sysRole.setId(0L);
+        model.addAttribute("action", "insert");
+        model.addAttribute("role", sysRole);
+        model.addAttribute("url", request.getContextPath() + "/sys/role/");
+        model.addAttribute("menuTree", JSON.toJSONString(sysMenuService.getMenuTree()));
+        return "role/detail";
+    }
+
+    @ApiOperation(value = "创建角色操作", notes = "创建角色操作")
+    @PostMapping(value = "/insert")
+    @ResponseBody
+    public ReturnDTO create(@Valid SysRole sysRole, @RequestParam(value = "ids", defaultValue = "") Long[] menuIds) {
+        sysRole.setId(null);
+        sysRoleService.insertSysRole(sysRole, menuIds);
+        return ReturnDTOUtil.success();
+    }
+
+    /**
+     * 检测角色编码是否存在
+     *
+     * @param id
+     * @param code
+     * @return
+     */
+    @GetMapping(value = "check/{id}")
+    @ResponseBody
+    public Boolean check(@PathVariable("id") Long id, @RequestParam("code") String code) {
+        return sysRoleService.checkRoleCode(code, id);
+    }
+
+    /**
+     * 查看用户详情界面
+     *
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping(value = "/detail/{id}")
+    public String detail(@PathVariable("id") Long id, Model model, HttpServletRequest request) {
+        model.addAttribute("action", "detail");
+        SysRole sysRole = sysRoleService.selectById(id);
+        model.addAttribute("role", sysRole);
+        model.addAttribute("menuTree", JSON.toJSONString(sysRoleService.selectMenuTreeHasSelectDis(id,true)));
+        model.addAttribute("url", request.getContextPath() + "/sys/role/");
+        return "role/detail";
+    }
+
+    /**
+     * 更新角色界面
+     *
+     * @param id
+     *
+     * @return
+     */
+
+    @GetMapping(value="update/{id}")
+    public String updateForm(@PathVariable("id") Long id,Model model, HttpServletRequest request){
+        model.addAttribute("action","update");
+        SysRole sysRole = sysRoleService.selectById(id);
+        model.addAttribute("role",sysRole);
+        model.addAttribute("url", request.getContextPath() + "/sys/role/");
+        model.addAttribute("menuTree", JSON.toJSONString(sysRoleService.selectMenuTreeHasSelectDis(id,false)));
+        return "role/detail";
+    }
+
+
+    @ApiOperation(value = "修改角色操作", notes = "修改角色操作")
+    @PostMapping(value = "/update")
+    @ResponseBody
+    public ReturnDTO update(@Valid SysRole sysRole, @RequestParam(value = "ids", defaultValue = "") Long[] menuIds) {
+        sysRoleService.insertSysRole(sysRole, menuIds);
+        return ReturnDTOUtil.success();
+    }
+
+
+    @PostMapping(value = "/tf")
+    @ResponseBody
+    public ReturnDTO tf() {
+        sysRoleService.tf();
+        return ReturnDTOUtil.success();
+    }
 }
diff --git a/slife-sys/src/main/java/com/slife/controller/SysUserController.java b/slife-sys/src/main/java/com/slife/controller/SysUserController.java
index 7af9abc..1ad4c2c 100644
--- a/slife-sys/src/main/java/com/slife/controller/SysUserController.java
+++ b/slife-sys/src/main/java/com/slife/controller/SysUserController.java
@@ -167,7 +167,7 @@ public class SysUserController extends BaseController {
      * @param id
      * @return
      */
-    @RequestMapping(value = "update/{id}")
+    @GetMapping(value = "update/{id}")
     public String update(@PathVariable("id") Long id, Model model,HttpServletRequest request) {
         model.addAttribute("action", "update");
         model.addAttribute("url", request.getContextPath() + "/sys/user/");
diff --git a/slife-sys/src/main/java/com/slife/dao/SysRoleMenuDao.java b/slife-sys/src/main/java/com/slife/dao/SysRoleMenuDao.java
new file mode 100644
index 0000000..d658063
--- /dev/null
+++ b/slife-sys/src/main/java/com/slife/dao/SysRoleMenuDao.java
@@ -0,0 +1,18 @@
+package com.slife.dao;
+
+import com.slife.base.dao.CrudDao;
+import com.slife.entity.SysRoleMenu;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author chen
+ * @date 2017/10/26
+ * <p>
+ * Email 122741482@qq.com
+ * <p>
+ * Describe:
+ */
+@Component
+public interface SysRoleMenuDao  extends CrudDao<SysRoleMenu> {
+}
diff --git a/slife-sys/src/main/java/com/slife/entity/SysRoleMenu.java b/slife-sys/src/main/java/com/slife/entity/SysRoleMenu.java
new file mode 100644
index 0000000..302c50b
--- /dev/null
+++ b/slife-sys/src/main/java/com/slife/entity/SysRoleMenu.java
@@ -0,0 +1,50 @@
+package com.slife.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+import java.io.Serializable;
+
+/**
+ * @author chen
+ * @date 2017/10/26
+ * <p>
+ * Email 122741482@qq.com
+ * <p>
+ * Describe: 角色 菜单 表
+ */
+@TableName("sys_role_sys_menu")
+public class SysRoleMenu implements Serializable {
+    private static final long serialVersionUID = -3876781931176875589L;
+
+    public SysRoleMenu() {
+
+    }
+
+    public SysRoleMenu(Long sysMenuId, Long sysRoleId) {
+        this.sysMenuId = sysMenuId;
+        this.sysRoleId = sysRoleId;
+    }
+
+    @TableField(value = "sys_menu_id")
+    private Long sysMenuId;
+
+    @TableField(value = "sys_role_id")
+    private Long sysRoleId;
+
+    public Long getSysRoleId() {
+        return sysRoleId;
+    }
+
+    public void setSysRoleId(Long sysRoleId) {
+        this.sysRoleId = sysRoleId;
+    }
+
+    public Long getSysMenuId() {
+        return sysMenuId;
+    }
+
+    public void setSysMenuId(Long sysMenuId) {
+        this.sysMenuId = sysMenuId;
+    }
+}
diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysRoleMenuService.java b/slife-sys/src/main/java/com/slife/service/impl/SysRoleMenuService.java
new file mode 100644
index 0000000..7356b53
--- /dev/null
+++ b/slife-sys/src/main/java/com/slife/service/impl/SysRoleMenuService.java
@@ -0,0 +1,21 @@
+package com.slife.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.slife.dao.SysRoleMenuDao;
+import com.slife.entity.SysRoleMenu;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ *
+ * @author chen
+ * @date 2017/10/26
+ * <p>
+ * Email 122741482@qq.com
+ * <p>
+ * Describe:
+ */
+@Service
+@Transactional(readOnly = true, rollbackFor = Exception.class)
+public class SysRoleMenuService  extends ServiceImpl<SysRoleMenuDao, SysRoleMenu> {
+}
diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java b/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java
index 0a96fa6..33926a6 100644
--- a/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java
+++ b/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java
@@ -2,35 +2,91 @@ package com.slife.service.impl;
 
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.toolkit.ArrayUtils;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.slife.base.service.impl.BaseService;
 import com.slife.base.vo.DataTable;
+import com.slife.base.vo.JsTree;
+import com.slife.base.vo.JsTreeState;
 import com.slife.constant.Global;
 import com.slife.dao.SysRoleDao;
+import com.slife.entity.SysMenu;
 import com.slife.entity.SysRole;
+import com.slife.entity.SysRoleMenu;
 import com.slife.entity.SysUserRole;
 import com.slife.vo.SysRoleVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * Created by chen on 2017/4/24.
+ * @author chen
+ * @date 2017/4/24
  * <p>
  * Email 122741482@qq.com
  * <p>
  * Describe: sys 角色 服务
  */
 @Service
-@Transactional(readOnly = true)
+@Transactional(readOnly = true, rollbackFor = Exception.class)
 public class SysRoleService extends BaseService<SysRoleDao, SysRole> {
 
     @Autowired
     private SysUserRoleService sysUserRoleService;
+    @Autowired
+    private SysRoleMenuService sysRoleMenuService;
+    @Autowired
+    private SysMenuService sysMenuService;
+
+    @Autowired
+    private SysRoleDao sysRoleDao;
+
+    /**
+     * 获取角色选中的菜单树
+     *
+     * @param roleId
+     * @return
+     */
+    public List<JsTree> selectMenuTreeHasSelectDis(Long roleId,Boolean disable) {
+
+        List<SysRoleMenu> sysRoleMenus = sysRoleMenuService.selectList(Condition.create().eq("sys_role_id", roleId));
+
+        Map<Long, Long> map = Maps.newHashMap();
+        sysRoleMenus.stream().parallel().forEach(sysRoleMenu -> map.put(sysRoleMenu.getSysMenuId(), sysRoleMenu.getSysMenuId()));
+
+        List<SysMenu> list =  sysMenuService.selectList(null);
+
+        List<JsTree> jts = list.stream().parallel().map(sysMenu -> {
+            JsTree jt = new JsTree();
+            jt.setId(sysMenu.getId().toString());
+            jt.setParent(sysMenu.getParentId() == null ? "#" : (sysMenu.getParentId().compareTo(0L) > 0 ? sysMenu.getParentId()
+                    .toString() : "#"));
+            jt.setText(sysMenu.getName());
+            JsTreeState jtState = new JsTreeState();
+            if (disable){
+                jtState.setDisabled(disable);
+            }
+
+            //一级节点除了主页,都是未选中状态
+            if ((sysMenu.getParentId() == null || 0L == sysMenu.getParentId()) && !"/index".equalsIgnoreCase(sysMenu.getHref())) {
+                jtState.setSelected(false);
+            } else {
+                jtState.setSelected(map.get(sysMenu.getId()) != null);
+            }
+            jt.setState(jtState);
+            return jt;
+        }).collect(Collectors.toList());
+
+        return jts;
+    }
 
     /**
      * 获取用户的角色和菜单
@@ -95,25 +151,62 @@ public class SysRoleService extends BaseService<SysRoleDao, SysRole> {
      * @param userId
      * @param ids
      */
-    @Transactional(readOnly = false)
+    @Transactional(readOnly = false, rollbackFor = Exception.class)
     public void insertSysRole(Long userId, Long[] ids) {
 
         //删除现有的用户角色
         sysUserRoleService.delete(Condition.create().eq("sys_user_id", userId));
         if (null != ids && ids.length > 0) {
-
-  /*          List<SysUserRole> sysUserRoles = new ArrayList<SysUserRole>();
-            for (Long roleId : ids) {
-                sysUserRoles.add(new SysUserRole(userId, roleId));
-            }*/
-
-            List<SysUserRole> sysUserRoles =Arrays.stream(ids).parallel().map(roleId->{
-                return new  SysUserRole(userId, roleId);
+            List<SysUserRole> sysUserRoles = Arrays.stream(ids).parallel().map(roleId -> {
+                return new SysUserRole(userId, roleId);
             }).collect(Collectors.toList());
-
-
             //保存用户角色
             sysUserRoleService.insertBatch(sysUserRoles);
         }
     }
+
+    @Transactional(readOnly = false, rollbackFor = Exception.class)
+    public void tf() {
+        SysRole s=new SysRole();
+        s.setName("ddddd");
+        this.baseMapper.insert(s);
+        double d=1/0;
+    }
+
+    /**
+     * 保存角色和对应的菜单
+     *
+     * @param sysRole
+     * @param menuIds
+     */
+    @Transactional(readOnly = false, rollbackFor = Exception.class)
+    public void insertSysRole(SysRole sysRole, Long[] menuIds) {
+
+        insertOrUpdate(sysRole);
+        Long roleId = sysRole.getId();
+        //删除现有的 角色 菜单
+        sysRoleMenuService.delete(Condition.create().eq("sys_role_id", roleId));
+        if (null != menuIds && menuIds.length > 0) {
+            List<SysRoleMenu> sysRoleMenu = Arrays.stream(menuIds).parallel().map(menuId -> {
+                return new SysRoleMenu(menuId, roleId);
+            }).collect(Collectors.toList());
+            //角色关联的菜单
+            sysRoleMenuService.insertBatch(sysRoleMenu);
+        }
+    }
+
+    /**
+     * 检测角色编码是否存在
+     *
+     * @param code
+     * @param id
+     * @return
+     */
+    public Boolean checkRoleCode(String code, Long id) {
+        SysRole sysRole = selectOne(Condition.create().eq("code", code));
+        return sysRole == null || !id.equals(0L) && sysRole.getId().equals(id);
+    }
+
+
+
 }
diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysUserRoleService.java b/slife-sys/src/main/java/com/slife/service/impl/SysUserRoleService.java
index 5d42931..83409a5 100644
--- a/slife-sys/src/main/java/com/slife/service/impl/SysUserRoleService.java
+++ b/slife-sys/src/main/java/com/slife/service/impl/SysUserRoleService.java
@@ -7,13 +7,15 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
- * Created by chen on 2017/9/1.
+ *
+ * @author chen
+ * @date 2017/9/1
  * <p>
  * Email 122741482@qq.com
  * <p>
  * Describe: 系统用户角色中间表
  */
 @Service
-@Transactional(readOnly = true)
+@Transactional(readOnly = true, rollbackFor = Exception.class)
 public class SysUserRoleService extends ServiceImpl<SysUserRoleDao, SysUserRole> {
 }
diff --git a/slife-sys/src/main/resources/templates/menu/list.ftl b/slife-sys/src/main/resources/templates/menu/list.ftl
index 7cb2f7c..e041dd2 100644
--- a/slife-sys/src/main/resources/templates/menu/list.ftl
+++ b/slife-sys/src/main/resources/templates/menu/list.ftl
@@ -57,7 +57,7 @@
 
                         </div>
                         <div class="portlet-body form" id="menu_edit_table">
-                            <form id="resourceForm" action="${base}/sys/menu/insert" class="form-horizontal form-bordered"
+                            <form id="menuForm" action="${base}/sys/menu/insert" class="form-horizontal form-bordered"
                                   method="POST">
                                 <input type="hidden" name="id"/>
                                 <input type="hidden" name="parentId" value="0"/>
@@ -271,7 +271,7 @@
 <script type="text/javascript">
 
 
-    var form = $('#resourceForm'), rid, text;
+    var form = $('#menuForm'), menuid, text;
     $("#resTree").jstree({
         "core": {
             "animation": 0,
@@ -317,7 +317,7 @@
                     $("select[name=showFlag] option[value='" + data.showFlag + "']").attr("selected", "selected");
                     $("select[name=showFlag] option[value!='" + data.showFlag + "']").attr("selected", false);
 
-                    $('#resourceForm :input').each(function (a) {
+                    $('#menuForm :input').each(function (a) {
                         $(this).attr('disabled', "disabled");
                         $(this).attr("readonly", "true");
                     });
@@ -325,6 +325,8 @@
                     $('.btn-children').enable();
                     $('.btn-edit').enable();
                     $('.btn-delete').enable();
+
+
                 }
             });
         }
@@ -370,7 +372,7 @@
         form.resetForm();
         $('input[name=id]').val("");
         $('input[name=parentId]').val(0);
-        $('#resourceForm :input').each(function (a) {
+        $('#menuForm :input').each(function (a) {
             $(this).enable();
             $(this).attr("readonly", false);
         });
@@ -382,7 +384,7 @@
         form.resetForm();
         $('input[name=id]').val("");
         $('input[name=parentId]').val(menuid);
-        $('#resourceForm :input').each(function (a) {
+        $('#menuForm :input').each(function (a) {
             $(this).enable();
             $(this).attr("readonly", false);
         });
@@ -390,14 +392,14 @@
         $('.btn-delete').attr('disabled', "disabled");
     });
     $('.btn-edit').click(function () {
-        $('#resourceForm :input').each(function (a) {
+        $('#menuForm :input').each(function (a) {
             $(this).enable();
             $(this).attr("readonly", false);
 
         });
     });
     $('.btn-cancel').click(function () {
-        $('#resourceForm :input').each(function (a) {
+        $('#menuForm :input').each(function (a) {
             $(this).attr('disabled', "disabled");
             $(this).attr("readonly", "true");
         });
diff --git a/slife-sys/src/main/resources/templates/role/detail.ftl b/slife-sys/src/main/resources/templates/role/detail.ftl
new file mode 100644
index 0000000..0948e1f
--- /dev/null
+++ b/slife-sys/src/main/resources/templates/role/detail.ftl
@@ -0,0 +1,174 @@
+<html>
+<head>
+    <title>系统用户编辑</title>
+
+    <link href="${base}/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+    <link href="${base}/css/font-awesome.min.css?v=4.4.0" rel="stylesheet">
+    <link href="${base}/css/animate.css" rel="stylesheet">
+    <link href="${base}/css/style.css?v=4.1.0" rel="stylesheet">
+    <link href="${base}/css/slife.css" rel="stylesheet">
+
+
+    <link rel="stylesheet" type="text/css" href="${base}/css/plugins/jsTree/style.min.css"/>
+    <!-- 全局js -->
+    <script src="${base}/js/jquery.min.js?v=2.1.4"></script>
+    <script src="${base}/js/bootstrap.min.js?v=3.3.6"></script>
+    <script src="${base}/js/plugins/validate/jquery.validate.min.js"></script>
+    <script src="${base}/js/plugins/validate/messages_zh.min.js"></script>
+    <script src="${base}/js/plugins/layer/layer.min.js"></script>
+    <script src="${base}/js/jquery.form.js"></script>
+
+
+    <script>
+        var url = "${url}", action = "${action}";
+
+    </script>
+    <script src="${base}/js/slife/slife.js"></script>
+    <script src="${base}/js/slife/slifeform.js"></script>
+</head>
+
+<body class="gray-bg">
+<div class="wrapper wrapper-content animated fadeInRight">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-content">
+
+                    <form class="form-horizontal form-bordered" id="slifeForm">
+
+                        <input type="hidden" name="id" value="${role.id}"/>
+                        <input type="hidden" name="ids"/>
+
+                        <div class="form-body">
+                            <div class="form-group">
+                                <label class="col-sm-3 control-label">名称<span class="required">*</span></label>
+
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" placeholder="录入权限名称" name="name"
+                                           value="${role.name}">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="col-sm-3 control-label">编码<span class="required">*</span></label>
+
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" placeholder="录入角色编码" name="code"
+                                           value="${role.code}">
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-3 control-label">状态<span class="required">*</span></label>
+
+                                <div class="col-sm-8">
+                                    <select name="useable" class="form-control">
+                                        <option value="Y">启用</option>
+                                        <option value="N">禁用</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-3 control-label">描述</label>
+
+                                <div class="col-sm-8">
+                                    <textarea name="remark" type="text" class="form-control"
+                                              placeholder="请输入角色描述">${role.remark}</textarea>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-3 control-label">菜单树</label>
+
+                                <div class="col-sm-8">
+                                    <div id="menuTree"></div>
+                                </div>
+                            </div>
+                        </div>
+
+
+                    <#if action !='detail'>
+                        <div class="form-actions fluid">
+                            <div class="col-md-offset-3 col-md-9">
+                                <button type="submit" class="btn green">保存</button>
+                            </div>
+                        </div>
+                    </#if>
+                    </form>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="${base}/js/plugins/jsTree/jstree.js" type="text/javascript"></script>
+<script type="text/javascript">
+    var tree = $("#menuTree").jstree({
+        "checkbox": {"keep_selected_style": false},
+        "core": {
+            "multiple": true,
+            "animation": 0,
+            "themes": {
+                theme: "classic",
+                "dots": true,
+                "icons": true
+            },
+            "check_callback": true,
+            'data':${menuTree}
+        },
+        "plugins": ["wholerow", "checkbox"],
+    });
+
+
+    $("select[name=useable] option[value='${role.useable}']").attr("selected", "selected");
+
+
+    /**
+     *  标志选择了的菜单
+     */
+    function selectMenuId() {
+        var array = $.jstree.reference('#menuTree').get_selected(true);
+        var ar = new Array();
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                var a = array[i]
+                ar.push(a.id);
+                if (a.parent != "#") {
+                    ar.push(a.parent);
+                }
+            }
+        }
+        $('input[name=ids]').val(ar.join(","));
+    }
+
+    function  cusFunction() {
+        selectMenuId();
+    }
+
+    var form = $('#slifeForm');
+    var error = $('.alert-danger', form);
+    form.validate({
+        errorElement: 'span',
+        errorClass: 'error',
+        focusInvalid: true,
+        messages: {
+            code: {remote: "角色编码已存在"}
+        },
+        rules: {
+            code: {
+                maxlength: 64,
+                required: true,
+                remote: '${base}/sys/role/check/${role.id}'
+            },
+            name: {
+                maxlength: 64,
+                required: true
+            },
+            active: {
+                required: true
+            }
+        }
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/slife-sys/src/main/resources/templates/role/list.ftl b/slife-sys/src/main/resources/templates/role/list.ftl
index dd87601..c3e98b7 100644
--- a/slife-sys/src/main/resources/templates/role/list.ftl
+++ b/slife-sys/src/main/resources/templates/role/list.ftl
@@ -24,7 +24,7 @@
                         <input type="text" class="form-filter input-sm _search" name="search_like_name">
                     </label>
                     <label style="margin-left: 10px;">
-                        角色代码：
+                        角色编码：
                         <input type="text" class="form-filter input-sm _search" name="search_like_code">
                     </label>
                     <label style="margin-left: 10px;">
@@ -43,7 +43,7 @@
                         <button type="button" class="btn  btn-danger" onclick="batch_remove()">
                             <i class="fa fa-trash" aria-hidden="true"></i>删除
                         </button>
-                        <button  type="button" class="btn  btn-info" onclick="add()">
+                        <button  type="button" class="btn  btn-info" onclick="dt_insert()">
                             <i class="fa fa-plus-square" aria-hidden="true"></i>添加
                         </button>
                     </label>
@@ -87,7 +87,7 @@
             },
             {
                 field: 'code',
-                title: '代码'
+                title: '编码'
             },
 
             {
diff --git a/slife-sys/src/main/resources/templates/user/detail.ftl b/slife-sys/src/main/resources/templates/user/detail.ftl
index 5841ae7..544aac4 100644
--- a/slife-sys/src/main/resources/templates/user/detail.ftl
+++ b/slife-sys/src/main/resources/templates/user/detail.ftl
@@ -176,6 +176,9 @@
 
 <script type="text/javascript">
 
+    function  cusFunction() {
+        console.info("提交之前，最后执行自定义的函数");
+    }
 
     /**
      * 错误图片的默认处理
diff --git a/slife-web/src/main/java/com/slife/WebApplication.java b/slife-web/src/main/java/com/slife/WebApplication.java
index c94b659..e9e210a 100644
--- a/slife-web/src/main/java/com/slife/WebApplication.java
+++ b/slife-web/src/main/java/com/slife/WebApplication.java
@@ -3,6 +3,7 @@ package com.slife;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @MapperScan(value = {"com.slife.dao"})  //@Mapper  在mapper 接口上加入也行
 @SpringBootApplication
diff --git a/slife-web/src/main/java/com/slife/config/db/DataSourceAop.java b/slife-web/src/main/java/com/slife/config/db/DataSourceAop.java
index 6ce38b2..77b3ad1 100644
--- a/slife-web/src/main/java/com/slife/config/db/DataSourceAop.java
+++ b/slife-web/src/main/java/com/slife/config/db/DataSourceAop.java
@@ -24,7 +24,8 @@ public class DataSourceAop {
         logger.info("dataSource切换到：Read");
     }
 
-    @Before("execution(* com.slife.dao..*.insert*(..)) || execution(* com.slife.dao..*.update*(..))")
+    @Before("execution(* com.slife.dao..*.insert**(..)) || execution(* com.slife.dao..*.update*(..)) || execution(* " +
+            "com.slife.dao..*.delete*(..))")
     public void setWriteDataSourceType() {
         DataSourceContextHolder.write();
         logger.info("dataSource切换到：write");
diff --git a/slife-web/src/main/java/com/slife/config/db/DruidAutoConfiguration.java b/slife-web/src/main/java/com/slife/config/db/DruidAutoConfiguration.java
index 9668993..b08090b 100644
--- a/slife-web/src/main/java/com/slife/config/db/DruidAutoConfiguration.java
+++ b/slife-web/src/main/java/com/slife/config/db/DruidAutoConfiguration.java
@@ -79,15 +79,7 @@ public class DruidAutoConfiguration {
     }
 
 
-    @Bean(name = "writeDataSource1")
-    @Primary
-    // @ConfigurationProperties(prefix = "writedatasource")
-    public DataSource writeDataSource() {
-        logger.info("-------------------- writeDataSource init ---------------------");
-        // return DataSourceBuilder.create().type(dataSourceType).build();
 
-        return dataSource(writeProperties);
-    }
 
     /**
      * 有多少个从库就要配置多少个
@@ -98,7 +90,6 @@ public class DruidAutoConfiguration {
     // @ConfigurationProperties(prefix = "readdatasource01")
     public DataSource readDataSourceOne() {
         logger.info("-------------------- readDataSourceOne init ---------------------");
-        // DataSource dataSource= DataSourceBuilder.create().type(dataSourceType).build();
         return dataSource(readProperties1);
     }
 
@@ -106,7 +97,6 @@ public class DruidAutoConfiguration {
     // @ConfigurationProperties(prefix = "readdatasource02")
     public DataSource readDataSourceTwo() {
         logger.info("-------------------- readDataSourceTwo init ---------------------");
-        //  return DataSourceBuilder.create().type(dataSourceType).build();
         return dataSource(readProperties2);
     }
 
@@ -117,4 +107,11 @@ public class DruidAutoConfiguration {
         dataSources.add(readDataSourceTwo());
         return dataSources;
     }
+
+    @Bean(name = "writeDataSource1")
+    @Primary
+    public DataSource writeDataSource() {
+        logger.info("-------------------- writeDataSource init ---------------------");
+        return dataSource(writeProperties);
+    }
 }
diff --git a/slife-web/src/main/java/com/slife/config/plus/MybatisPlusConfig.java b/slife-web/src/main/java/com/slife/config/plus/MybatisPlusConfig.java
index a2ab6d3..6ba4f5b 100644
--- a/slife-web/src/main/java/com/slife/config/plus/MybatisPlusConfig.java
+++ b/slife-web/src/main/java/com/slife/config/plus/MybatisPlusConfig.java
@@ -90,12 +90,10 @@ public class MybatisPlusConfig {
 	@Bean
 	public MybatisSqlSessionFactoryBean mybatisSqlSessionFactoryBean() {
 		MybatisSqlSessionFactoryBean mybatisPlus = new MybatisSqlSessionFactoryBean();
-		//mybatisPlus.setDataSource(dataSource);
 
 		mybatisPlus.setDataSource(roundRobinDataSouceProxy());
-
-
 		mybatisPlus.setVfs(SpringBootVFS.class);
+
 		if (StringUtils.hasText(this.properties.getConfigLocation())) {
 			mybatisPlus.setConfigLocation(this.resourceLoader.getResource(this.properties.getConfigLocation()));
 		}
@@ -140,10 +138,10 @@ public class MybatisPlusConfig {
 
 		BlifeAbstractRoutingDataSource proxy = new BlifeAbstractRoutingDataSource(size);
 		Map<Object, Object> targetDataSources = new HashMap<Object, Object>();
-		// DataSource writeDataSource = SpringContextHolder.getBean("writeDataSource");
+
 		// 写
 		targetDataSources.put(DataSourceType.write.getType(),writeDataSource);
-		// targetDataSources.put(DataSourceType.read.getType(),readDataSource);
+
 		//多个读数据库时
 		for (int i = 0; i < size; i++) {
 			targetDataSources.put(i, readDataSources.get(i));
diff --git a/slife-web/src/main/resources/static/js/plugins/jsTree/jstree.js b/slife-web/src/main/resources/static/js/plugins/jsTree/jstree.js
index 694cedb..971396a 100644
--- a/slife-web/src/main/resources/static/js/plugins/jsTree/jstree.js
+++ b/slife-web/src/main/resources/static/js/plugins/jsTree/jstree.js
@@ -1,33 +1,34 @@
-/*globals jQuery, define, module, exports, require, window, document, postMessage */
+/*globals jQuery, define, exports, require, window, document */
 (function (factory) {
 	"use strict";
 	if (typeof define === 'function' && define.amd) {
 		define(['jquery'], factory);
 	}
-	else if(typeof module !== 'undefined' && module.exports) {
-		module.exports = factory(require('jquery'));
+	else if (typeof exports === 'object') {
+		factory(require('jquery'));
 	}
 	else {
 		factory(jQuery);
 	}
 }(function ($, undefined) {
 	"use strict";
-/*!
- * jsTree 4.1.0
- * http://jstree.com/
- *
- * Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
- *
- * Licensed same as jquery - under the terms of the MIT License
- *   http://www.opensource.org/licenses/mit-license.php
- */
-/*!
- * if using jslint please allow for the jQuery global and use following options:
- * jslint: browser: true, ass: true, bitwise: true, continue: true, nomen: true, plusplus: true, regexp: true, unparam: true, todo: true, white: true
- */
+	/*!
+	 * jsTree 3.0.3
+	 * http://jstree.com/
+	 *
+	 * Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
+	 *
+	 * Licensed same as jquery - under the terms of the MIT License
+	 *   http://www.opensource.org/licenses/mit-license.php
+	 */
+	/*!
+	 * if using jslint please allow for the jQuery global and use following options:
+	 * jslint: browser: true, ass: true, bitwise: true, continue: true, nomen: true, plusplus: true, regexp: true, unparam: true, todo: true, white: true
+	 */
 
 	// prevent another load? maybe there is a better way?
-	if($.jstree) {
+	if ($.jstree) {
+		return;
 	}
 
 	/**
@@ -41,21 +42,17 @@
 		ccp_inst = false,
 		themes_loaded = [],
 		src = $('script:last').attr('src'),
-		document = window.document, // local variable is always faster to access then a global
-		_node = document.createElement('LI'), _temp1, _temp2;
+		_d = document, _node = _d.createElement('LI'), _temp1, _temp2;
 
 	_node.setAttribute('role', 'treeitem');
-	_temp1 = document.createElement('I');
+	_temp1 = _d.createElement('I');
 	_temp1.className = 'jstree-icon jstree-ocl';
-	_temp1.setAttribute('role', 'presentation');
 	_node.appendChild(_temp1);
-	_temp1 = document.createElement('A');
+	_temp1 = _d.createElement('A');
 	_temp1.className = 'jstree-anchor';
-	_temp1.setAttribute('href','#');
-	_temp1.setAttribute('tabindex','-1');
-	_temp2 = document.createElement('I');
+	_temp1.setAttribute('href', '#');
+	_temp2 = _d.createElement('I');
 	_temp2.className = 'jstree-icon jstree-themeicon';
-	_temp2.setAttribute('role', 'presentation');
 	_temp1.appendChild(_temp2);
 	_node.appendChild(_temp1);
 	_temp1 = _temp2 = null;
@@ -70,26 +67,25 @@
 		 * specifies the jstree version in use
 		 * @name $.jstree.version
 		 */
-		version : '4.1.0',
+		version: '3.0.3',
 		/**
 		 * holds all the default options used when creating new instances
 		 * @name $.jstree.defaults
 		 */
-		defaults : {
+		defaults: {
 			/**
 			 * configure which plugins will be active on an instance. Should be an array of strings, where each element is a plugin name. The default is `[]`
 			 * @name $.jstree.defaults.plugins
 			 */
-			plugins : []
+			plugins: []
 		},
 		/**
 		 * stores all loaded jstree plugins (used internally)
 		 * @name $.jstree.plugins
 		 */
-		plugins : {},
-		path : src && src.indexOf('/') !== -1 ? src.replace(/\/[^\/]+$/,'') : '',
-		idregex : /[\\:&!^|()\[\]<>@*'+~#";.,=\- \/${}%?`]/g,
-		root : '#'
+		plugins: {},
+		path: src && src.indexOf('/') !== -1 ? src.replace(/\/[^\/]+$/, '') : '',
+		idregex: /[\\:&!^|()\[\]<>@*'+~#";.,=\- \/${}%]/g
 	};
 	/**
 	 * creates a jstree instance
@@ -102,26 +98,17 @@
 		var tmp = new $.jstree.core(++instance_counter),
 			opt = options;
 		options = $.extend(true, {}, $.jstree.defaults, options);
-		if(opt && opt.plugins) {
+		if (opt && opt.plugins) {
 			options.plugins = opt.plugins;
 		}
 		$.each(options.plugins, function (i, k) {
-			if(i !== 'core') {
+			if (i !== 'core') {
 				tmp = tmp.plugin(k, options[k]);
 			}
 		});
-		$(el).data('jstree', tmp);
 		tmp.init(el, options);
 		return tmp;
 	};
-	/**
-	 * remove all traces of jstree from the DOM and destroy all instances
-	 * @name $.jstree.destroy()
-	 */
-	$.jstree.destroy = function () {
-		$('.jstree:jstree').jstree('destroy');
-		$(document).off('.jstree');
-	};
 	/**
 	 * the jstree class constructor, used only internally
 	 * @private
@@ -133,17 +120,16 @@
 		this._cnt = 0;
 		this._wrk = null;
 		this._data = {
-			core : {
-				themes : {
-					name : false,
-					dots : false,
-					icons : false
+			core: {
+				themes: {
+					name: false,
+					dots: false,
+					icons: false
 				},
-				selected : [],
-				last_error : {},
-				working : false,
-				worker_queue : [],
-				focused : null
+				selected: [],
+				last_error: {},
+				working: false,
+				worker_queue: []
 			}
 		};
 	};
@@ -152,16 +138,16 @@
 	 *
 	 * __Examples__
 	 *
-	 *	// provided a container with an ID of "tree", and a nested node with an ID of "branch"
-	 *	// all of there will return the same instance
-	 *	$.jstree.reference('tree');
-	 *	$.jstree.reference('#tree');
-	 *	$.jstree.reference($('#tree'));
-	 *	$.jstree.reference(document.getElementByID('tree'));
-	 *	$.jstree.reference('branch');
-	 *	$.jstree.reference('#branch');
-	 *	$.jstree.reference($('#branch'));
-	 *	$.jstree.reference(document.getElementByID('branch'));
+	 *    // provided a container with an ID of "tree", and a nested node with an ID of "branch"
+	 *    // all of there will return the same instance
+	 *    $.jstree.reference('tree');
+	 *    $.jstree.reference('#tree');
+	 *    $.jstree.reference($('#tree'));
+	 *    $.jstree.reference(document.getElementByID('tree'));
+	 *    $.jstree.reference('branch');
+	 *    $.jstree.reference('#branch');
+	 *    $.jstree.reference($('#branch'));
+	 *    $.jstree.reference(document.getElementByID('branch'));
 	 *
 	 * @name $.jstree.reference(needle)
 	 * @param {DOMElement|jQuery|String} needle
@@ -170,21 +156,29 @@
 	$.jstree.reference = function (needle) {
 		var tmp = null,
 			obj = null;
-		if(needle && needle.id && (!needle.tagName || !needle.nodeType)) { needle = needle.id; }
+		if (needle && needle.id) {
+			needle = needle.id;
+		}
 
-		if(!obj || !obj.length) {
-			try { obj = $(needle); } catch (ignore) { }
+		if (!obj || !obj.length) {
+			try {
+				obj = $(needle);
+			} catch (ignore) {
+			}
 		}
-		if(!obj || !obj.length) {
-			try { obj = $('#' + needle.replace($.jstree.idregex,'\\$&')); } catch (ignore) { }
+		if (!obj || !obj.length) {
+			try {
+				obj = $('#' + needle.replace($.jstree.idregex, '\\$&'));
+			} catch (ignore) {
+			}
 		}
-		if(obj && obj.length && (obj = obj.closest('.jstree')).length && (obj = obj.data('jstree'))) {
+		if (obj && obj.length && (obj = obj.closest('.jstree')).length && (obj = obj.data('jstree'))) {
 			tmp = obj;
 		}
 		else {
 			$('.jstree').each(function () {
 				var inst = $(this).data('jstree');
-				if(inst && inst._model.data[needle]) {
+				if (inst && inst._model.data[needle]) {
 					tmp = inst;
 					return false;
 				}
@@ -205,12 +199,12 @@
 	 *
 	 * __Examples__
 	 *
-	 *	$('#tree1').jstree(); // creates an instance
-	 *	$('#tree2').jstree({ plugins : [] }); // create an instance with some options
-	 *	$('#tree1').jstree('open_node', '#branch_1'); // call a method on an existing instance, passing additional arguments
-	 *	$('#tree2').jstree(); // get an existing instance (or create an instance)
-	 *	$('#tree2').jstree(true); // get an existing instance (will not create new instance)
-	 *	$('#branch_1').jstree().select_node('#branch_1'); // get an instance (using a nested element and call a method)
+	 *    $('#tree1').jstree(); // creates an instance
+	 *    $('#tree2').jstree({ plugins : [] }); // create an instance with some options
+	 *    $('#tree1').jstree('open_node', '#branch_1'); // call a method on an existing instance, passing additional arguments
+	 *    $('#tree2').jstree(); // get an existing instance (or create an instance)
+	 *    $('#tree2').jstree(true); // get an existing instance (will not create new instance)
+	 *    $('#branch_1').jstree().select_node('#branch_1'); // get an instance (using a nested element and call a method)
 	 *
 	 * @name $().jstree([arg])
 	 * @param {String|Object} arg
@@ -218,10 +212,9 @@
 	 */
 	$.fn.jstree = function (arg) {
 		// check for string argument
-		var is_method	= (typeof arg === 'string'),
-			args		= Array.prototype.slice.call(arguments, 1),
-			result		= null;
-		if(arg === true && !this.length) { return false; }
+		var is_method = (typeof arg === 'string'),
+			args = Array.prototype.slice.call(arguments, 1),
+			result = null;
 		this.each(function () {
 			// get the instance (if there is one) and method (if it exists)
 			var instance = $.jstree.reference(this),
@@ -231,15 +224,15 @@
 				method.apply(instance, args) :
 				null;
 			// if there is no instance and no method is being called - create one
-			if(!instance && !is_method && (arg === undefined || $.isPlainObject(arg))) {
-				$.jstree.create(this, arg);
+			if (!instance && !is_method && (arg === undefined || $.isPlainObject(arg))) {
+				$(this).data('jstree', new $.jstree.create(this, arg));
 			}
 			// if there is an instance and no method is called - return the instance
-			if( (instance && !is_method) || arg === true ) {
+			if ((instance && !is_method) || arg === true) {
 				result = instance || false;
 			}
 			// if there was a method call which returned a result - break and return the value
-			if(result !== null && result !== undefined) {
+			if (result !== null && result !== undefined) {
 				return false;
 			}
 		});
@@ -252,15 +245,15 @@
 	 *
 	 * __Examples__
 	 *
-	 *	$('div:jstree').each(function () {
+	 *    $('div:jstree').each(function () {
 	 *		$(this).jstree('destroy');
 	 *	});
 	 *
 	 * @name $(':jstree')
 	 * @return {jQuery}
 	 */
-	$.expr[':'].jstree = $.expr.createPseudo(function(search) {
-		return function(a) {
+	$.expr[':'].jstree = $.expr.createPseudo(function (search) {
+		return function (a) {
 			return $(a).hasClass('jstree') &&
 				$(a).data('jstree') !== undefined;
 		};
@@ -285,8 +278,8 @@
 		 *
 		 * __Examples__
 		 *
-		 *	// AJAX
-		 *	$('#tree').jstree({
+		 *    // AJAX
+		 *    $('#tree').jstree({
 		 *		'core' : {
 		 *			'data' : {
 		 *				'url' : '/get/children/',
@@ -320,7 +313,7 @@
 		 *
 		 * @name $.jstree.defaults.core.data
 		 */
-		data			: false,
+		data: false,
 		/**
 		 * configure the various strings used throughout the tree
 		 *
@@ -330,7 +323,7 @@
 		 *
 		 * __Examples__
 		 *
-		 *	$('#tree').jstree({
+		 *    $('#tree').jstree({
 		 *		'core' : {
 		 *			'strings' : {
 		 *				'Loading ...' : 'Please wait ...'
@@ -340,7 +333,7 @@
 		 *
 		 * @name $.jstree.defaults.core.strings
 		 */
-		strings			: false,
+		strings: false,
 		/**
 		 * determines what happens when a user tries to modify the structure of the tree
 		 * If left as `false` all operations like create, rename, delete, move or copy are prevented.
@@ -348,7 +341,7 @@
 		 *
 		 * __Examples__
 		 *
-		 *	$('#tree').jstree({
+		 *    $('#tree').jstree({
 		 *		'core' : {
 		 *			'check_callback' : function (operation, node, node_parent, node_position, more) {
 		 *				// operation can be 'create_node', 'rename_node', 'delete_node', 'move_node' or 'copy_node'
@@ -360,88 +353,83 @@
 		 *
 		 * @name $.jstree.defaults.core.check_callback
 		 */
-		check_callback	: false,
+		check_callback: false,
 		/**
 		 * a callback called with a single object parameter in the instance's scope when something goes wrong (operation prevented, ajax failed, etc)
 		 * @name $.jstree.defaults.core.error
 		 */
-		error			: $.noop,
+		error: $.noop,
 		/**
 		 * the open / close animation duration in milliseconds - set this to `false` to disable the animation (default is `200`)
 		 * @name $.jstree.defaults.core.animation
 		 */
-		animation		: 200,
+		animation: 200,
 		/**
 		 * a boolean indicating if multiple nodes can be selected
 		 * @name $.jstree.defaults.core.multiple
 		 */
-		multiple		: true,
+		multiple: true,
 		/**
 		 * theme configuration object
 		 * @name $.jstree.defaults.core.themes
 		 */
-		themes			: {
+		themes: {
 			/**
 			 * the name of the theme to use (if left as `false` the default theme is used)
 			 * @name $.jstree.defaults.core.themes.name
 			 */
-			name			: false,
+			name: false,
 			/**
 			 * the URL of the theme's CSS file, leave this as `false` if you have manually included the theme CSS (recommended). You can set this to `true` too which will try to autoload the theme.
 			 * @name $.jstree.defaults.core.themes.url
 			 */
-			url				: false,
+			url: false,
 			/**
 			 * the location of all jstree themes - only used if `url` is set to `true`
 			 * @name $.jstree.defaults.core.themes.dir
 			 */
-			dir				: false,
+			dir: false,
 			/**
 			 * a boolean indicating if connecting dots are shown
 			 * @name $.jstree.defaults.core.themes.dots
 			 */
-			dots			: true,
+			dots: true,
 			/**
 			 * a boolean indicating if node icons are shown
 			 * @name $.jstree.defaults.core.themes.icons
 			 */
-			icons			: true,
+			icons: true,
 			/**
 			 * a boolean indicating if the tree background is striped
 			 * @name $.jstree.defaults.core.themes.stripes
 			 */
-			stripes			: false,
+			stripes: false,
 			/**
 			 * a string (or boolean `false`) specifying the theme variant to use (if the theme supports variants)
 			 * @name $.jstree.defaults.core.themes.variant
 			 */
-			variant			: false,
+			variant: false,
 			/**
 			 * a boolean specifying if a reponsive version of the theme should kick in on smaller screens (if the theme supports it). Defaults to `false`.
 			 * @name $.jstree.defaults.core.themes.responsive
 			 */
-			responsive		: false
+			responsive: false
 		},
 		/**
 		 * if left as `true` all parents of all selected nodes will be opened once the tree loads (so that all selected nodes are visible to the user)
 		 * @name $.jstree.defaults.core.expand_selected_onload
 		 */
-		expand_selected_onload : true,
+		expand_selected_onload: true,
 		/**
 		 * if left as `true` web workers will be used to parse incoming JSON data where possible, so that the UI will not be blocked by large requests. Workers are however about 30% slower. Defaults to `true`
 		 * @name $.jstree.defaults.core.worker
 		 */
-		worker : true,
+		worker: true,
 		/**
 		 * Force node text to plain text (and escape HTML). Defaults to `false`
 		 * @name $.jstree.defaults.core.force_text
 		 */
-		force_text : false,
-		/**
-		 * Should the node should be toggled if the text is double clicked . Defaults to `true`
-		 * @name $.jstree.defaults.core.dblclick_toggle
-		 */
-		dblclick_toggle : true
+		force_text: false
 	};
 	$.jstree.core.prototype = {
 		/**
@@ -452,9 +440,9 @@
 		 * @param  {Object} opts options for the plugin
 		 * @return {jsTree}
 		 */
-		plugin : function (deco, opts) {
+		plugin: function (deco, opts) {
 			var Child = $.jstree.plugins[deco];
-			if(Child) {
+			if (Child) {
 				this._data[deco] = {};
 				Child.prototype = this;
 				return new Child(opts, this);
@@ -462,49 +450,45 @@
 			return this;
 		},
 		/**
-		 * initialize the instance. Used internally.
+		 * used to decorate an instance with a plugin. Used internally.
 		 * @private
 		 * @name init(el, optons)
 		 * @param {DOMElement|jQuery|String} el the element we are transforming
 		 * @param {Object} options options for this instance
 		 * @trigger init.jstree, loading.jstree, loaded.jstree, ready.jstree, changed.jstree
 		 */
-		init : function (el, options) {
+		init: function (el, options) {
 			this._model = {
-				data : {},
-				changed : [],
-				force_full_redraw : false,
-				redraw_timeout : false,
-				default_state : {
-					loaded : true,
-					opened : false,
-					selected : false,
-					disabled : false
+				data: {
+					'#': {
+						id: '#',
+						parent: null,
+						parents: [],
+						children: [],
+						children_d: [],
+						state: { loaded: false }
+					}
+				},
+				changed: [],
+				force_full_redraw: false,
+				redraw_timeout: false,
+				default_state: {
+					loaded: true,
+					opened: false,
+					selected: false,
+					disabled: false
 				}
 			};
-			this._model.data[$.jstree.root] = {
-				id : $.jstree.root,
-				parent : null,
-				parents : [],
-				children : [],
-				children_d : [],
-				state : { loaded : false }
-			};
 
 			this.element = $(el).addClass('jstree jstree-' + this._id);
 			this.settings = options;
+			this.element.bind("destroyed", $.proxy(this.teardown, this));
 
 			this._data.core.ready = false;
 			this._data.core.loaded = false;
 			this._data.core.rtl = (this.element.css("direction") === "rtl");
 			this.element[this._data.core.rtl ? 'addClass' : 'removeClass']("jstree-rtl");
-			this.element.attr('role','tree');
-			if(this.settings.core.multiple) {
-				this.element.attr('aria-multiselectable', true);
-			}
-			if(!this.element.attr('tabindex')) {
-				this.element.attr('tabindex','0');
-			}
+			this.element.attr('role', 'tree');
 
 			this.bind();
 			/**
@@ -517,35 +501,30 @@
 			this._data.core.original_container_html = this.element.find(" > ul > li").clone(true);
 			this._data.core.original_container_html
 				.find("li").addBack()
-				.contents().filter(function() {
-					return this.nodeType === 3 && (!this.nodeValue || /^\s+$/.test(this.nodeValue));
-				})
+				.contents().filter(function () {
+				return this.nodeType === 3 && (!this.nodeValue || /^\s+$/.test(this.nodeValue));
+			})
 				.remove();
-			this.element.html("<"+"ul class='jstree-container-ul jstree-children' role='group'><"+"li id='j"+this._id+"_loading' class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='tree-item'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("加载中 ...") + "</a></li></ul>");
-			this.element.attr('aria-activedescendant','j' + this._id + '_loading');
-			this._data.core.li_height = this.get_container_ul().children("li").first().height() || 24;
+			this.element.html("<" + "ul class='jstree-container-ul jstree-children'><" + "li class='jstree-initial-node jstree-loading jstree-leaf jstree-last'><i class='jstree-icon jstree-ocl'></i><" + "a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
+			this._data.core.li_height = this.get_container_ul().children("li:eq(0)").height() || 24;
 			/**
 			 * triggered after the loading text is shown and before loading starts
 			 * @event
 			 * @name loading.jstree
 			 */
 			this.trigger("loading");
-			this.load_node($.jstree.root);
+			this.load_node('#');
 		},
 		/**
 		 * destroy an instance
 		 * @name destroy()
 		 * @param  {Boolean} keep_html if not set to `true` the container will be emptied, otherwise the current DOM elements will be kept intact
 		 */
-		destroy : function (keep_html) {
-			if(this._wrk) {
-				try {
-					window.URL.revokeObjectURL(this._wrk);
-					this._wrk = null;
-				}
-				catch (ignore) { }
+		destroy: function (keep_html) {
+			if (!keep_html) {
+				this.element.empty();
 			}
-			if(!keep_html) { this.element.empty(); }
+			this.element.unbind("destroyed", this.teardown);
 			this.teardown();
 		},
 		/**
@@ -553,14 +532,16 @@
 		 * @private
 		 * @name teardown()
 		 */
-		teardown : function () {
+		teardown: function () {
 			this.unbind();
 			this.element
 				.removeClass('jstree')
 				.removeData('jstree')
 				.find("[class^='jstree']")
-					.addBack()
-					.attr("class", function () { return this.className.replace(/jstree[^ ]*|$/ig,''); });
+				.addBack()
+				.attr("class", function () {
+					return this.className.replace(/jstree[^ ]*|$/ig, '');
+				});
 			this.element = null;
 		},
 		/**
@@ -568,284 +549,177 @@
 		 * @private
 		 * @name bind()
 		 */
-		bind : function () {
-			var word = '',
-				tout = null,
-				was_click = 0;
+		bind: function () {
 			this.element
-				.on("dblclick.jstree", function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(document.selection && document.selection.empty) {
-							document.selection.empty();
-						}
-						else {
-							if(window.getSelection) {
-								var sel = window.getSelection();
-								try {
-									sel.removeAllRanges();
-									sel.collapse();
-								} catch (ignore) { }
+				.on("dblclick.jstree", function () {
+					if (document.selection && document.selection.empty) {
+						document.selection.empty();
+					}
+					else {
+						if (window.getSelection) {
+							var sel = window.getSelection();
+							try {
+								sel.removeAllRanges();
+								sel.collapse();
+							} catch (ignore) {
 							}
 						}
-					})
-				.on("mousedown.jstree", $.proxy(function (e) {
-						if(e.target === this.element[0]) {
-							e.preventDefault(); // prevent losing focus when clicking scroll arrows (FF, Chrome)
-							was_click = +(new Date()); // ie does not allow to prevent losing focus
-						}
-					}, this))
-				.on("mousedown.jstree", ".jstree-ocl", function (e) {
-						e.preventDefault(); // prevent any node inside from losing focus when clicking the open/close icon
-					})
+					}
+				})
 				.on("click.jstree", ".jstree-ocl", $.proxy(function (e) {
-						this.toggle_node(e.target);
-					}, this))
-				.on("dblclick.jstree", ".jstree-anchor", $.proxy(function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(this.settings.core.dblclick_toggle) {
-							this.toggle_node(e.target);
-						}
-					}, this))
+					this.toggle_node(e.target);
+				}, this))
 				.on("click.jstree", ".jstree-anchor", $.proxy(function (e) {
-						e.preventDefault();
-						if(e.currentTarget !== document.activeElement) { $(e.currentTarget).focus(); }
-						this.activate_node(e.currentTarget, e);
-					}, this))
+					e.preventDefault();
+					$(e.currentTarget).focus();
+					this.activate_node(e.currentTarget, e);
+				}, this))
 				.on('keydown.jstree', '.jstree-anchor', $.proxy(function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(e.which !== 32 && e.which !== 13 && (e.shiftKey || e.ctrlKey || e.altKey || e.metaKey)) { return true; }
-						var o = null;
-						if(this._data.core.rtl) {
-							if(e.which === 37) { e.which = 39; }
-							else if(e.which === 39) { e.which = 37; }
-						}
-						switch(e.which) {
-							case 32: // aria defines space only with Ctrl
-								if(e.ctrlKey) {
-									e.type = "click";
-									$(e.currentTarget).trigger(e);
-								}
-								break;
-							case 13: // enter
-								e.type = "click";
-								$(e.currentTarget).trigger(e);
-								break;
-							case 37: // right
-								e.preventDefault();
-								if(this.is_open(e.currentTarget)) {
-									this.close_node(e.currentTarget);
-								}
-								else {
-									o = this.get_parent(e.currentTarget);
-									if(o && o.id !== $.jstree.root) { this.get_node(o, true).children('.jstree-anchor').focus(); }
-								}
-								break;
-							case 38: // up
-								e.preventDefault();
+					if (e.target.tagName === "INPUT") {
+						return true;
+					}
+					var o = null;
+					switch (e.which) {
+						case 13:
+						case 32:
+							e.type = "click";
+							$(e.currentTarget).trigger(e);
+							break;
+						case 37:
+							e.preventDefault();
+							if (this.is_open(e.currentTarget)) {
+								this.close_node(e.currentTarget);
+							}
+							else {
 								o = this.get_prev_dom(e.currentTarget);
-								if(o && o.length) { o.children('.jstree-anchor').focus(); }
-								break;
-							case 39: // left
-								e.preventDefault();
-								if(this.is_closed(e.currentTarget)) {
-									this.open_node(e.currentTarget, function (o) { this.get_node(o, true).children('.jstree-anchor').focus(); });
+								if (o && o.length) {
+									o.children('.jstree-anchor').focus();
 								}
-								else if (this.is_open(e.currentTarget)) {
-									o = this.get_node(e.currentTarget, true).children('.jstree-children')[0];
-									if(o) { $(this._firstChild(o)).children('.jstree-anchor').focus(); }
-								}
-								break;
-							case 40: // down
-								e.preventDefault();
+							}
+							break;
+						case 38:
+							e.preventDefault();
+							o = this.get_prev_dom(e.currentTarget);
+							if (o && o.length) {
+								o.children('.jstree-anchor').focus();
+							}
+							break;
+						case 39:
+							e.preventDefault();
+							if (this.is_closed(e.currentTarget)) {
+								this.open_node(e.currentTarget, function (o) {
+									this.get_node(o, true).children('.jstree-anchor').focus();
+								});
+							}
+							else {
 								o = this.get_next_dom(e.currentTarget);
-								if(o && o.length) { o.children('.jstree-anchor').focus(); }
-								break;
-							case 106: // aria defines * on numpad as open_all - not very common
-								this.open_all();
-								break;
-							case 36: // home
-								e.preventDefault();
-								o = this._firstChild(this.get_container_ul()[0]);
-								if(o) { $(o).children('.jstree-anchor').filter(':visible').focus(); }
-								break;
-							case 35: // end
-								e.preventDefault();
-								this.element.find('.jstree-anchor').filter(':visible').last().focus();
-								break;
-							/*
-							// delete
-							case 46:
-								e.preventDefault();
-								o = this.get_node(e.currentTarget);
-								if(o && o.id && o.id !== $.jstree.root) {
-									o = this.is_selected(o) ? this.get_selected() : o;
-									this.delete_node(o);
+								if (o && o.length) {
+									o.children('.jstree-anchor').focus();
 								}
-								break;
-							// f2
-							case 113:
-								e.preventDefault();
-								o = this.get_node(e.currentTarget);
-								if(o && o.id && o.id !== $.jstree.root) {
-									// this.edit(o);
-								}
-								break;
-							default:
-								// console.log(e.which);
-								break;
-							*/
-						}
-					}, this))
+							}
+							break;
+						case 40:
+							e.preventDefault();
+							o = this.get_next_dom(e.currentTarget);
+							if (o && o.length) {
+								o.children('.jstree-anchor').focus();
+							}
+							break;
+						// delete
+						case 46:
+							e.preventDefault();
+							o = this.get_node(e.currentTarget);
+							if (o && o.id && o.id !== '#') {
+								o = this.is_selected(o) ? this.get_selected() : o;
+								// this.delete_node(o);
+							}
+							break;
+						// f2
+						case 113:
+							e.preventDefault();
+							o = this.get_node(e.currentTarget);
+							/*!
+							 if(o && o.id && o.id !== '#') {
+							 // this.edit(o);
+							 }
+							 */
+							break;
+						default:
+							// console.log(e.which);
+							break;
+					}
+				}, this))
 				.on("load_node.jstree", $.proxy(function (e, data) {
-						if(data.status) {
-							if(data.node.id === $.jstree.root && !this._data.core.loaded) {
-								this._data.core.loaded = true;
-								if(this._firstChild(this.get_container_ul()[0])) {
-									this.element.attr('aria-activedescendant',this._firstChild(this.get_container_ul()[0]).id);
-								}
-								/**
-								 * triggered after the root node is loaded for the first time
-								 * @event
-								 * @name loaded.jstree
-								 */
-								this.trigger("loaded");
-							}
-							if(!this._data.core.ready) {
-								setTimeout($.proxy(function() {
-									if(this.element && !this.get_container_ul().find('.jstree-loading').length) {
-										this._data.core.ready = true;
-										if(this._data.core.selected.length) {
-											if(this.settings.core.expand_selected_onload) {
-												var tmp = [], i, j;
-												for(i = 0, j = this._data.core.selected.length; i < j; i++) {
-													tmp = tmp.concat(this._model.data[this._data.core.selected[i]].parents);
-												}
-												tmp = $.vakata.array_unique(tmp);
-												for(i = 0, j = tmp.length; i < j; i++) {
-													this.open_node(tmp[i], false, 0);
-												}
-											}
-											this.trigger('changed', { 'action' : 'ready', 'selected' : this._data.core.selected });
-										}
-										/**
-										 * triggered after all nodes are finished loading
-										 * @event
-										 * @name ready.jstree
-										 */
-										this.trigger("ready");
+					if (data.status) {
+						if (data.node.id === '#' && !this._data.core.loaded) {
+							this._data.core.loaded = true;
+							/**
+							 * triggered after the root node is loaded for the first time
+							 * @event
+							 * @name loaded.jstree
+							 */
+							this.trigger("loaded");
+						}
+						if (!this._data.core.ready && !this.get_container_ul().find('.jstree-loading:eq(0)').length) {
+							this._data.core.ready = true;
+							if (this._data.core.selected.length) {
+								if (this.settings.core.expand_selected_onload) {
+									var tmp = [], i, j;
+									for (i = 0, j = this._data.core.selected.length; i < j; i++) {
+										tmp = tmp.concat(this._model.data[this._data.core.selected[i]].parents);
 									}
-								}, this), 0);
+									tmp = $.vakata.array_unique(tmp);
+									for (i = 0, j = tmp.length; i < j; i++) {
+										this.open_node(tmp[i], false, 0);
+									}
+								}
+								this.trigger('changed', { 'action': 'ready', 'selected': this._data.core.selected });
 							}
+							/**
+							 * triggered after all nodes are finished loading
+							 * @event
+							 * @name ready.jstree
+							 */
+							setTimeout($.proxy(function () {
+								this.trigger("ready");
+							}, this), 0);
 						}
-					}, this))
-				// quick searching when the tree is focused
-				.on('keypress.jstree', $.proxy(function (e) {
-						if(e.target.tagName && e.target.tagName.toLowerCase() === "input") { return true; }
-						if(tout) { clearTimeout(tout); }
-						tout = setTimeout(function () {
-							word = '';
-						}, 500);
-
-						var chr = String.fromCharCode(e.which).toLowerCase(),
-							col = this.element.find('.jstree-anchor').filter(':visible'),
-							ind = col.index(document.activeElement) || 0,
-							end = false;
-						word += chr;
-
-						// match for whole word from current node down (including the current node)
-						if(word.length > 1) {
-							col.slice(ind).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().indexOf(word) === 0) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-
-							// match for whole word from the beginning of the tree
-							col.slice(0, ind).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().indexOf(word) === 0) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-						}
-						// list nodes that start with that letter (only if word consists of a single char)
-						if(new RegExp('^' + chr.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + '+$').test(word)) {
-							// search for the next node starting with that letter
-							col.slice(ind + 1).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().charAt(0) === chr) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-
-							// search from the beginning
-							col.slice(0, ind + 1).each($.proxy(function (i, v) {
-								if($(v).text().toLowerCase().charAt(0) === chr) {
-									$(v).focus();
-									end = true;
-									return false;
-								}
-							}, this));
-							if(end) { return; }
-						}
-					}, this))
+					}
+				}, this))
 				// THEME RELATED
 				.on("init.jstree", $.proxy(function () {
-						var s = this.settings.core.themes;
-						this._data.core.themes.dots			= s.dots;
-						this._data.core.themes.stripes		= s.stripes;
-						this._data.core.themes.icons		= s.icons;
-						this.set_theme(s.name || "default", s.url);
-						this.set_theme_variant(s.variant);
-					}, this))
+					var s = this.settings.core.themes;
+					this._data.core.themes.dots = s.dots;
+					this._data.core.themes.stripes = s.stripes;
+					this._data.core.themes.icons = s.icons;
+					this.set_theme(s.name || "default", s.url);
+					this.set_theme_variant(s.variant);
+				}, this))
 				.on("loading.jstree", $.proxy(function () {
-						this[ this._data.core.themes.dots ? "show_dots" : "hide_dots" ]();
-						this[ this._data.core.themes.icons ? "show_icons" : "hide_icons" ]();
-						this[ this._data.core.themes.stripes ? "show_stripes" : "hide_stripes" ]();
-					}, this))
+					this[ this._data.core.themes.dots ? "show_dots" : "hide_dots" ]();
+					this[ this._data.core.themes.icons ? "show_icons" : "hide_icons" ]();
+					this[ this._data.core.themes.stripes ? "show_stripes" : "hide_stripes" ]();
+				}, this))
 				.on('blur.jstree', '.jstree-anchor', $.proxy(function (e) {
-						this._data.core.focused = null;
-						$(e.currentTarget).filter('.jstree-hovered').mouseleave();
-						this.element.attr('tabindex', '0');
-					}, this))
+					$(e.currentTarget).filter('.jstree-hovered').mouseleave();
+				}, this))
 				.on('focus.jstree', '.jstree-anchor', $.proxy(function (e) {
-						var tmp = this.get_node(e.currentTarget);
-						if(tmp && tmp.id) {
-							this._data.core.focused = tmp.id;
-						}
-						this.element.find('.jstree-hovered').not(e.currentTarget).mouseleave();
-						$(e.currentTarget).mouseenter();
-						this.element.attr('tabindex', '-1');
-					}, this))
-				.on('focus.jstree', $.proxy(function () {
-						if(+(new Date()) - was_click > 500 && !this._data.core.focused) {
-							was_click = 0;
-							var act = this.get_node(this.element.attr('aria-activedescendant'), true);
-							if(act) {
-								act.find('> .jstree-anchor').focus();
-							}
-						}
-					}, this))
+					this.element.find('.jstree-hovered').not(e.currentTarget).mouseleave();
+					$(e.currentTarget).mouseenter();
+				}, this))
 				.on('mouseenter.jstree', '.jstree-anchor', $.proxy(function (e) {
-						this.hover_node(e.currentTarget);
-					}, this))
+					this.hover_node(e.currentTarget);
+				}, this))
 				.on('mouseleave.jstree', '.jstree-anchor', $.proxy(function (e) {
-						this.dehover_node(e.currentTarget);
-					}, this));
+					this.dehover_node(e.currentTarget);
+				}, this));
 		},
 		/**
 		 * part of the destroying of an instance. Used internally.
 		 * @private
 		 * @name unbind()
 		 */
-		unbind : function () {
+		unbind: function () {
 			this.element.off('.jstree');
 			$(document).off('.jstree-' + this._id);
 		},
@@ -856,19 +730,19 @@
 		 * @param  {String} ev the name of the event to trigger
 		 * @param  {Object} data additional data to pass with the event
 		 */
-		trigger : function (ev, data) {
-			if(!data) {
+		trigger: function (ev, data) {
+			if (!data) {
 				data = {};
 			}
 			data.instance = this;
-			this.element.triggerHandler(ev.replace('.jstree','') + '.jstree', data);
+			this.element.triggerHandler(ev.replace('.jstree', '') + '.jstree', data);
 		},
 		/**
 		 * returns the jQuery extended instance container
 		 * @name get_container()
 		 * @return {jQuery}
 		 */
-		get_container : function () {
+		get_container: function () {
 			return this.element;
 		},
 		/**
@@ -877,8 +751,8 @@
 		 * @name get_container_ul()
 		 * @return {jQuery}
 		 */
-		get_container_ul : function () {
-			return this.element.children(".jstree-children").first();
+		get_container_ul: function () {
+			return this.element.children(".jstree-children:eq(0)");
 		},
 		/**
 		 * gets string replacements (localization). Used internally.
@@ -887,10 +761,14 @@
 		 * @param  {String} key
 		 * @return {String}
 		 */
-		get_string : function (key) {
+		get_string: function (key) {
 			var a = this.settings.core.strings;
-			if($.isFunction(a)) { return a.call(this, key); }
-			if(a && a[key]) { return a[key]; }
+			if ($.isFunction(a)) {
+				return a.call(this, key);
+			}
+			if (a && a[key]) {
+				return a[key];
+			}
 			return key;
 		},
 		/**
@@ -900,9 +778,9 @@
 		 * @param  {DOMElement} dom
 		 * @return {DOMElement}
 		 */
-		_firstChild : function (dom) {
+		_firstChild: function (dom) {
 			dom = dom ? dom.firstChild : null;
-			while(dom !== null && dom.nodeType !== 1) {
+			while (dom !== null && dom.nodeType !== 1) {
 				dom = dom.nextSibling;
 			}
 			return dom;
@@ -914,9 +792,9 @@
 		 * @param  {DOMElement} dom
 		 * @return {DOMElement}
 		 */
-		_nextSibling : function (dom) {
+		_nextSibling: function (dom) {
 			dom = dom ? dom.nextSibling : null;
-			while(dom !== null && dom.nodeType !== 1) {
+			while (dom !== null && dom.nodeType !== 1) {
 				dom = dom.nextSibling;
 			}
 			return dom;
@@ -928,9 +806,9 @@
 		 * @param  {DOMElement} dom
 		 * @return {DOMElement}
 		 */
-		_previousSibling : function (dom) {
+		_previousSibling: function (dom) {
 			dom = dom ? dom.previousSibling : null;
-			while(dom !== null && dom.nodeType !== 1) {
+			while (dom !== null && dom.nodeType !== 1) {
 				dom = dom.previousSibling;
 			}
 			return dom;
@@ -942,36 +820,32 @@
 		 * @param  {Boolean} as_dom
 		 * @return {Object|jQuery}
 		 */
-		get_node : function (obj, as_dom) {
-			if(obj && obj.id) {
+		get_node: function (obj, as_dom) {
+			if (obj && obj.id) {
 				obj = obj.id;
 			}
 			var dom;
 			try {
-				if(this._model.data[obj]) {
+				if (this._model.data[obj]) {
 					obj = this._model.data[obj];
 				}
-				else if(typeof obj === "string" && this._model.data[obj.replace(/^#/, '')]) {
-					obj = this._model.data[obj.replace(/^#/, '')];
-				}
-				else if(typeof obj === "string" && (dom = $('#' + obj.replace($.jstree.idregex,'\\$&'), this.element)).length && this._model.data[dom.closest('.jstree-node').attr('id')]) {
+				else if (((dom = $(obj, this.element)).length || (dom = $('#' + obj.replace($.jstree.idregex, '\\$&'), this.element)).length) && this._model.data[dom.closest('.jstree-node').attr('id')]) {
 					obj = this._model.data[dom.closest('.jstree-node').attr('id')];
 				}
-				else if((dom = $(obj, this.element)).length && this._model.data[dom.closest('.jstree-node').attr('id')]) {
-					obj = this._model.data[dom.closest('.jstree-node').attr('id')];
-				}
-				else if((dom = $(obj, this.element)).length && dom.hasClass('jstree')) {
-					obj = this._model.data[$.jstree.root];
+				else if ((dom = $(obj, this.element)).length && dom.hasClass('jstree')) {
+					obj = this._model.data['#'];
 				}
 				else {
 					return false;
 				}
 
-				if(as_dom) {
-					obj = obj.id === $.jstree.root ? this.element : $('#' + obj.id.replace($.jstree.idregex,'\\$&'), this.element);
+				if (as_dom) {
+					obj = obj.id === '#' ? this.element : $('#' + obj.id.replace($.jstree.idregex, '\\$&'), this.element);
 				}
 				return obj;
-			} catch (ex) { return false; }
+			} catch (ex) {
+				return false;
+			}
 		},
 		/**
 		 * get the path to a node, either consisting of node texts, or of node IDs, optionally glued together (otherwise an array)
@@ -981,14 +855,14 @@
 		 * @param  {Boolean} ids if set to true build the path using ID, otherwise node text is used
 		 * @return {mixed}
 		 */
-		get_path : function (obj, glue, ids) {
+		get_path: function (obj, glue, ids) {
 			obj = obj.parents ? obj : this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root || !obj.parents) {
+			if (!obj || obj.id === '#' || !obj.parents) {
 				return false;
 			}
 			var i, j, p = [];
 			p.push(ids ? obj.id : obj.text);
-			for(i = 0, j = obj.parents.length; i < j; i++) {
+			for (i = 0, j = obj.parents.length; i < j; i++) {
 				p.push(ids ? obj.parents[i] : this.get_text(obj.parents[i]));
 			}
 			p = p.reverse().slice(1);
@@ -1001,43 +875,28 @@
 		 * @param  {Boolean} strict
 		 * @return {jQuery}
 		 */
-		get_next_dom : function (obj, strict) {
+		get_next_dom: function (obj, strict) {
 			var tmp;
 			obj = this.get_node(obj, true);
-			if(obj[0] === this.element[0]) {
+			if (obj[0] === this.element[0]) {
 				tmp = this._firstChild(this.get_container_ul()[0]);
-				while (tmp && tmp.offsetHeight === 0) {
-					tmp = this._nextSibling(tmp);
-				}
 				return tmp ? $(tmp) : false;
 			}
-			if(!obj || !obj.length) {
+			if (!obj || !obj.length) {
 				return false;
 			}
-			if(strict) {
-				tmp = obj[0];
-				do {
-					tmp = this._nextSibling(tmp);
-				} while (tmp && tmp.offsetHeight === 0);
+			if (strict) {
+				tmp = this._nextSibling(obj[0]);
 				return tmp ? $(tmp) : false;
 			}
-			if(obj.hasClass("jstree-open")) {
+			if (obj.hasClass("jstree-open")) {
 				tmp = this._firstChild(obj.children('.jstree-children')[0]);
-				while (tmp && tmp.offsetHeight === 0) {
-					tmp = this._nextSibling(tmp);
-				}
-				if(tmp !== null) {
-					return $(tmp);
-				}
+				return tmp ? $(tmp) : false;
 			}
-			tmp = obj[0];
-			do {
-				tmp = this._nextSibling(tmp);
-			} while (tmp && tmp.offsetHeight === 0);
-			if(tmp !== null) {
+			if ((tmp = this._nextSibling(obj[0])) !== null) {
 				return $(tmp);
 			}
-			return obj.parentsUntil(".jstree",".jstree-node").nextAll(".jstree-node:visible").first();
+			return obj.parentsUntil(".jstree", ".jstree-node").next(".jstree-node").eq(0);
 		},
 		/**
 		 * get the previous visible node that is above the `obj` node. If `strict` is set to `true` only sibling nodes are returned.
@@ -1046,34 +905,24 @@
 		 * @param  {Boolean} strict
 		 * @return {jQuery}
 		 */
-		get_prev_dom : function (obj, strict) {
+		get_prev_dom: function (obj, strict) {
 			var tmp;
 			obj = this.get_node(obj, true);
-			if(obj[0] === this.element[0]) {
+			if (obj[0] === this.element[0]) {
 				tmp = this.get_container_ul()[0].lastChild;
-				while (tmp && tmp.offsetHeight === 0) {
-					tmp = this._previousSibling(tmp);
-				}
 				return tmp ? $(tmp) : false;
 			}
-			if(!obj || !obj.length) {
+			if (!obj || !obj.length) {
 				return false;
 			}
-			if(strict) {
-				tmp = obj[0];
-				do {
-					tmp = this._previousSibling(tmp);
-				} while (tmp && tmp.offsetHeight === 0);
+			if (strict) {
+				tmp = this._previousSibling(obj[0]);
 				return tmp ? $(tmp) : false;
 			}
-			tmp = obj[0];
-			do {
-				tmp = this._previousSibling(tmp);
-			} while (tmp && tmp.offsetHeight === 0);
-			if(tmp !== null) {
+			if ((tmp = this._previousSibling(obj[0])) !== null) {
 				obj = $(tmp);
-				while(obj.hasClass("jstree-open")) {
-					obj = obj.children(".jstree-children").first().children(".jstree-node:visible:last");
+				while (obj.hasClass("jstree-open")) {
+					obj = obj.children(".jstree-children:eq(0)").children(".jstree-node:last");
 				}
 				return obj;
 			}
@@ -1086,9 +935,9 @@
 		 * @param  {mixed} obj
 		 * @return {String}
 		 */
-		get_parent : function (obj) {
+		get_parent: function (obj) {
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			return obj.parent;
@@ -1099,12 +948,12 @@
 		 * @param  {mixed} obj
 		 * @return {jQuery}
 		 */
-		get_children_dom : function (obj) {
+		get_children_dom: function (obj) {
 			obj = this.get_node(obj, true);
-			if(obj[0] === this.element[0]) {
+			if (obj[0] === this.element[0]) {
 				return this.get_container_ul().children(".jstree-node");
 			}
-			if(!obj || !obj.length) {
+			if (!obj || !obj.length) {
 				return false;
 			}
 			return obj.children(".jstree-children").children(".jstree-node");
@@ -1115,7 +964,7 @@
 		 * @param  {mixed} obj
 		 * @return {Boolean}
 		 */
-		is_parent : function (obj) {
+		is_parent: function (obj) {
 			obj = this.get_node(obj);
 			return obj && (obj.state.loaded === false || obj.children.length > 0);
 		},
@@ -1125,7 +974,7 @@
 		 * @param  {mixed} obj
 		 * @return {Boolean}
 		 */
-		is_loaded : function (obj) {
+		is_loaded: function (obj) {
 			obj = this.get_node(obj);
 			return obj && obj.state.loaded;
 		},
@@ -1135,7 +984,7 @@
 		 * @param  {mixed} obj
 		 * @return {Boolean}
 		 */
-		is_loading : function (obj) {
+		is_loading: function (obj) {
 			obj = this.get_node(obj);
 			return obj && obj.state && obj.state.loading;
 		},
@@ -1145,7 +994,7 @@
 		 * @param  {mixed} obj
 		 * @return {Boolean}
 		 */
-		is_open : function (obj) {
+		is_open: function (obj) {
 			obj = this.get_node(obj);
 			return obj && obj.state.opened;
 		},
@@ -1155,7 +1004,7 @@
 		 * @param  {mixed} obj
 		 * @return {Boolean}
 		 */
-		is_closed : function (obj) {
+		is_closed: function (obj) {
 			obj = this.get_node(obj);
 			return obj && this.is_parent(obj) && !obj.state.opened;
 		},
@@ -1165,7 +1014,7 @@
 		 * @param  {mixed} obj
 		 * @return {Boolean}
 		 */
-		is_leaf : function (obj) {
+		is_leaf: function (obj) {
 			return !this.is_parent(obj);
 		},
 		/**
@@ -1176,25 +1025,27 @@
 		 * @return {Boolean}
 		 * @trigger load_node.jstree
 		 */
-		load_node : function (obj, callback) {
+		load_node: function (obj, callback) {
 			var k, l, i, j, c;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				this._load_nodes(obj.slice(), callback);
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj) {
-				if(callback) { callback.call(this, obj, false); }
+			if (!obj) {
+				if (callback) {
+					callback.call(this, obj, false);
+				}
 				return false;
 			}
 			// if(obj.state.loading) { } // the node is already loading - just wait for it to load and invoke callback? but if called implicitly it should be loaded again?
-			if(obj.state.loaded) {
+			if (obj.state.loaded) {
 				obj.state.loaded = false;
-				for(k = 0, l = obj.children_d.length; k < l; k++) {
-					for(i = 0, j = obj.parents.length; i < j; i++) {
+				for (k = 0, l = obj.children_d.length; k < l; k++) {
+					for (i = 0, j = obj.parents.length; i < j; i++) {
 						this._model.data[obj.parents[i]].children_d = $.vakata.array_remove_item(this._model.data[obj.parents[i]].children_d, obj.children_d[k]);
 					}
-					if(this._model.data[obj.children_d[k]].state.selected) {
+					if (this._model.data[obj.children_d[k]].state.selected) {
 						c = true;
 						this._data.core.selected = $.vakata.array_remove_item(this._data.core.selected, obj.children_d[k]);
 					}
@@ -1202,29 +1053,21 @@
 				}
 				obj.children = [];
 				obj.children_d = [];
-				if(c) {
-					this.trigger('changed', { 'action' : 'load_node', 'node' : obj, 'selected' : this._data.core.selected });
+				if (c) {
+					this.trigger('changed', { 'action': 'load_node', 'node': obj, 'selected': this._data.core.selected });
 				}
 			}
-			obj.state.failed = false;
 			obj.state.loading = true;
-			this.get_node(obj, true).addClass("jstree-loading").attr('aria-busy',true);
+			this.get_node(obj, true).addClass("jstree-loading");
 			this._load_node(obj, $.proxy(function (status) {
 				obj = this._model.data[obj.id];
 				obj.state.loading = false;
 				obj.state.loaded = status;
-				obj.state.failed = !obj.state.loaded;
-				var dom = this.get_node(obj, true), i = 0, j = 0, m = this._model.data, has_children = false;
-				for(i = 0, j = obj.children.length; i < j; i++) {
-					if(m[obj.children[i]] && !m[obj.children[i]].state.hidden) {
-						has_children = true;
-						break;
-					}
-				}
-				if(obj.state.loaded && !has_children && dom && dom.length && !dom.hasClass('jstree-leaf')) {
+				var dom = this.get_node(obj, true);
+				if (obj.state.loaded && !obj.children.length && dom && dom.length && !dom.hasClass('jstree-leaf')) {
 					dom.removeClass('jstree-closed jstree-open').addClass('jstree-leaf');
 				}
-				dom.removeClass("jstree-loading").attr('aria-busy',false);
+				dom.removeClass("jstree-loading");
 				/**
 				 * triggered after a node is loaded
 				 * @event
@@ -1232,8 +1075,8 @@
 				 * @param {Object} node the node that was loading
 				 * @param {Boolean} status was the node loaded successfully
 				 */
-				this.trigger('load_node', { "node" : obj, "status" : status });
-				if(callback) {
+				this.trigger('load_node', { "node": obj, "status": status });
+				if (callback) {
 					callback.call(this, obj, status);
 				}
 			}, this));
@@ -1246,69 +1089,27 @@
 		 * @param  {array} nodes
 		 * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - the array passed to _load_nodes
 		 */
-		_load_nodes : function (nodes, callback, is_callback) {
+		_load_nodes: function (nodes, callback, is_callback) {
 			var r = true,
-				c = function () { this._load_nodes(nodes, callback, true); },
-				m = this._model.data, i, j, tmp = [];
-			for(i = 0, j = nodes.length; i < j; i++) {
-				if(m[nodes[i]] && ( (!m[nodes[i]].state.loaded && !m[nodes[i]].state.failed) || !is_callback)) {
-					if(!this.is_loading(nodes[i])) {
+				c = function () {
+					this._load_nodes(nodes, callback, true);
+				},
+				m = this._model.data, i, j;
+			for (i = 0, j = nodes.length; i < j; i++) {
+				if (m[nodes[i]] && (!m[nodes[i]].state.loaded || !is_callback)) {
+					if (!this.is_loading(nodes[i])) {
 						this.load_node(nodes[i], c);
 					}
 					r = false;
 				}
 			}
-			if(r) {
-				for(i = 0, j = nodes.length; i < j; i++) {
-					if(m[nodes[i]] && m[nodes[i]].state.loaded) {
-						tmp.push(nodes[i]);
-					}
-				}
-				if(callback && !callback.done) {
-					callback.call(this, tmp);
+			if (r) {
+				if (callback && !callback.done) {
+					callback.call(this, nodes);
 					callback.done = true;
 				}
 			}
 		},
-		/**
-		 * loads all unloaded nodes
-		 * @name load_all([obj, callback])
-		 * @param {mixed} obj the node to load recursively, omit to load all nodes in the tree
-		 * @param {function} callback a function to be executed once loading all the nodes is complete,
-		 * @trigger load_all.jstree
-		 */
-		load_all : function (obj, callback) {
-			if(!obj) { obj = $.jstree.root; }
-			obj = this.get_node(obj);
-			if(!obj) { return false; }
-			var to_load = [],
-				m = this._model.data,
-				c = m[obj.id].children_d,
-				i, j;
-			if(obj.state && !obj.state.loaded) {
-				to_load.push(obj.id);
-			}
-			for(i = 0, j = c.length; i < j; i++) {
-				if(m[c[i]] && m[c[i]].state && !m[c[i]].state.loaded) {
-					to_load.push(c[i]);
-				}
-			}
-			if(to_load.length) {
-				this._load_nodes(to_load, function () {
-					this.load_all(obj, callback);
-				});
-			}
-			else {
-				/**
-				 * triggered after a load_all call completes
-				 * @event
-				 * @name load_all.jstree
-				 * @param {Object} node the recursively loaded node
-				 */
-				if(callback) { callback.call(this, obj); }
-				this.trigger('load_all', { "node" : obj });
-			}
-		},
 		/**
 		 * handles the actual loading of a node. Used only internally.
 		 * @private
@@ -1317,11 +1118,11 @@
 		 * @param  {function} callback a function to be executed once loading is complete, the function is executed in the instance's scope and receives one argument - a boolean status
 		 * @return {Boolean}
 		 */
-		_load_node : function (obj, callback) {
+		_load_node: function (obj, callback) {
 			var s = this.settings.core.data, t;
 			// use original HTML
-			if(!s) {
-				if(obj.id === $.jstree.root) {
+			if (!s) {
+				if (obj.id === '#') {
 					return this._append_html_data(obj, this._data.core.original_container_html.clone(true), function (status) {
 						callback.call(this, status);
 					});
@@ -1329,74 +1130,78 @@
 				else {
 					return callback.call(this, false);
 				}
-				// return callback.call(this, obj.id === $.jstree.root ? this._append_html_data(obj, this._data.core.original_container_html.clone(true)) : false);
+				// return callback.call(this, obj.id === '#' ? this._append_html_data(obj, this._data.core.original_container_html.clone(true)) : false);
 			}
-			if($.isFunction(s)) {
+			if ($.isFunction(s)) {
 				return s.call(this, obj, $.proxy(function (d) {
-					if(d === false) {
+					if (d === false) {
 						callback.call(this, false);
 					}
-					this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $($.parseHTML(d)).filter(function () { return this.nodeType !== 3; }) : d, function (status) {
+					this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $(d) : d, function (status) {
 						callback.call(this, status);
 					});
 					// return d === false ? callback.call(this, false) : callback.call(this, this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $(d) : d));
 				}, this));
 			}
-			if(typeof s === 'object') {
-				if(s.url) {
+			if (typeof s === 'object') {
+				if (s.url) {
 					s = $.extend(true, {}, s);
-					if($.isFunction(s.url)) {
+					if ($.isFunction(s.url)) {
 						s.url = s.url.call(this, obj);
 					}
-					if($.isFunction(s.data)) {
+					if ($.isFunction(s.data)) {
 						s.data = s.data.call(this, obj);
 					}
 					return $.ajax(s)
-						.done($.proxy(function (d,t,x) {
-								var type = x.getResponseHeader('Content-Type');
-								if((type && type.indexOf('json') !== -1) || typeof d === "object") {
-									return this._append_json_data(obj, d, function (status) { callback.call(this, status); });
-									//return callback.call(this, this._append_json_data(obj, d));
-								}
-								if((type && type.indexOf('html') !== -1) || typeof d === "string") {
-									return this._append_html_data(obj, $($.parseHTML(d)).filter(function () { return this.nodeType !== 3; }), function (status) { callback.call(this, status); });
-									// return callback.call(this, this._append_html_data(obj, $(d)));
-								}
-								this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : x }) };
-								this.settings.core.error.call(this, this._data.core.last_error);
-								return callback.call(this, false);
-							}, this))
+						.done($.proxy(function (d, t, x) {
+							var type = x.getResponseHeader('Content-Type');
+							if (type.indexOf('json') !== -1 || typeof d === "object") {
+								return this._append_json_data(obj, d, function (status) {
+									callback.call(this, status);
+								});
+								//return callback.call(this, this._append_json_data(obj, d));
+							}
+							if (type.indexOf('html') !== -1 || typeof d === "string") {
+								return this._append_html_data(obj, $(d), function (status) {
+									callback.call(this, status);
+								});
+								// return callback.call(this, this._append_html_data(obj, $(d)));
+							}
+							this._data.core.last_error = { 'error': 'ajax', 'plugin': 'core', 'id': 'core_04', 'reason': 'Could not load node', 'data': JSON.stringify({ 'id': obj.id, 'xhr': x }) };
+							this.settings.core.error.call(this, this._data.core.last_error);
+							return callback.call(this, false);
+						}, this))
 						.fail($.proxy(function (f) {
-								callback.call(this, false);
-								this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'core', 'id' : 'core_04', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id, 'xhr' : f }) };
-								this.settings.core.error.call(this, this._data.core.last_error);
-							}, this));
+							callback.call(this, false);
+							this._data.core.last_error = { 'error': 'ajax', 'plugin': 'core', 'id': 'core_04', 'reason': 'Could not load node', 'data': JSON.stringify({ 'id': obj.id, 'xhr': f }) };
+							this.settings.core.error.call(this, this._data.core.last_error);
+						}, this));
 				}
 				t = ($.isArray(s) || $.isPlainObject(s)) ? JSON.parse(JSON.stringify(s)) : s;
-				if(obj.id === $.jstree.root) {
+				if (obj.id === '#') {
 					return this._append_json_data(obj, t, function (status) {
 						callback.call(this, status);
 					});
 				}
 				else {
-					this._data.core.last_error = { 'error' : 'nodata', 'plugin' : 'core', 'id' : 'core_05', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id }) };
+					this._data.core.last_error = { 'error': 'nodata', 'plugin': 'core', 'id': 'core_05', 'reason': 'Could not load node', 'data': JSON.stringify({ 'id': obj.id }) };
 					this.settings.core.error.call(this, this._data.core.last_error);
 					return callback.call(this, false);
 				}
-				//return callback.call(this, (obj.id === $.jstree.root ? this._append_json_data(obj, t) : false) );
+				//return callback.call(this, (obj.id === "#" ? this._append_json_data(obj, t) : false) );
 			}
-			if(typeof s === 'string') {
-				if(obj.id === $.jstree.root) {
-					return this._append_html_data(obj, $($.parseHTML(s)).filter(function () { return this.nodeType !== 3; }), function (status) {
+			if (typeof s === 'string') {
+				if (obj.id === '#') {
+					return this._append_html_data(obj, $(s), function (status) {
 						callback.call(this, status);
 					});
 				}
 				else {
-					this._data.core.last_error = { 'error' : 'nodata', 'plugin' : 'core', 'id' : 'core_06', 'reason' : 'Could not load node', 'data' : JSON.stringify({ 'id' : obj.id }) };
+					this._data.core.last_error = { 'error': 'nodata', 'plugin': 'core', 'id': 'core_06', 'reason': 'Could not load node', 'data': JSON.stringify({ 'id': obj.id }) };
 					this.settings.core.error.call(this, this._data.core.last_error);
 					return callback.call(this, false);
 				}
-				//return callback.call(this, (obj.id === $.jstree.root ? this._append_html_data(obj, $(s)) : false) );
+				//return callback.call(this, (obj.id === "#" ? this._append_html_data(obj, $(s)) : false) );
 			}
 			return callback.call(this, false);
 		},
@@ -1406,9 +1211,9 @@
 		 * @name _node_changed(obj [, callback])
 		 * @param  {mixed} obj
 		 */
-		_node_changed : function (obj) {
+		_node_changed: function (obj) {
 			obj = this.get_node(obj);
-			if(obj) {
+			if (obj) {
 				this._model.changed.push(obj.id);
 			}
 		},
@@ -1420,7 +1225,7 @@
 		 * @param  {String} data the HTML string to parse and append
 		 * @trigger model.jstree, changed.jstree
 		 */
-		_append_html_data : function (dom, data, cb) {
+		_append_html_data: function (dom, data, cb) {
 			dom = this.get_node(dom);
 			dom.children = [];
 			dom.children_d = [];
@@ -1434,17 +1239,17 @@
 				tmp, i, j;
 			dat.each($.proxy(function (i, v) {
 				tmp = this._parse_model_from_html($(v), par, p.parents.concat());
-				if(tmp) {
+				if (tmp) {
 					chd.push(tmp);
 					dpc.push(tmp);
-					if(m[tmp].children_d.length) {
+					if (m[tmp].children_d.length) {
 						dpc = dpc.concat(m[tmp].children_d);
 					}
 				}
 			}, this));
 			p.children = chd;
 			p.children_d = dpc;
-			for(i = 0, j = p.parents.length; i < j; i++) {
+			for (i = 0, j = p.parents.length; i < j; i++) {
 				m[p.parents[i]].children_d = m[p.parents[i]].children_d.concat(dpc);
 			}
 			/**
@@ -1454,8 +1259,8 @@
 			 * @param {Array} nodes an array of node IDs
 			 * @param {String} parent the parent ID of the nodes
 			 */
-			this.trigger('model', { "nodes" : dpc, 'parent' : par });
-			if(par !== $.jstree.root) {
+			this.trigger('model', { "nodes": dpc, 'parent': par });
+			if (par !== '#') {
 				this._node_changed(par);
 				this.redraw();
 			}
@@ -1463,8 +1268,8 @@
 				this.get_container_ul().children('.jstree-initial-node').remove();
 				this.redraw(true);
 			}
-			if(this._data.core.selected.length !== s) {
-				this.trigger('changed', { 'action' : 'model', 'selected' : this._data.core.selected });
+			if (this._data.core.selected.length !== s) {
+				this.trigger('changed', { 'action': 'model', 'selected': this._data.core.selected });
 			}
 			cb.call(this, true);
 		},
@@ -1474,34 +1279,36 @@
 		 * @name _append_json_data(obj, data)
 		 * @param  {mixed} obj the node to append to
 		 * @param  {String} data the JSON object to parse and append
-		 * @param  {Boolean} force_processing internal param - do not set
 		 * @trigger model.jstree, changed.jstree
 		 */
-		_append_json_data : function (dom, data, cb, force_processing) {
-			if(this.element === null) { return; }
+		_append_json_data: function (dom, data, cb) {
 			dom = this.get_node(dom);
 			dom.children = [];
 			dom.children_d = [];
 			// *%$@!!!
-			if(data.d) {
+			if (data.d) {
 				data = data.d;
-				if(typeof data === "string") {
+				if (typeof data === "string") {
 					data = JSON.parse(data);
 				}
 			}
-			if(!$.isArray(data)) { data = [data]; }
+			if (!$.isArray(data)) {
+				data = [data];
+			}
 			var w = null,
 				args = {
-					'df'	: this._model.default_state,
-					'dat'	: data,
-					'par'	: dom.id,
-					'm'		: this._model.data,
-					't_id'	: this._id,
-					't_cnt'	: this._cnt,
-					'sel'	: this._data.core.selected
+					'df': this._model.default_state,
+					'dat': data,
+					'par': dom.id,
+					'm': this._model.data,
+					't_id': this._id,
+					't_cnt': this._cnt,
+					'sel': this._data.core.selected
 				},
 				func = function (data, undefined) {
-					if(data.data) { data = data.data; }
+					if (data.data) {
+						data = data.data;
+					}
 					var dat = data.dat,
 						par = data.par,
 						chd = [],
@@ -1515,180 +1322,190 @@
 						sel = data.sel,
 						tmp, i, j, rslt,
 						parse_flat = function (d, p, ps) {
-							if(!ps) { ps = []; }
-							else { ps = ps.concat(); }
-							if(p) { ps.unshift(p); }
+							if (!ps) {
+								ps = [];
+							}
+							else {
+								ps = ps.concat();
+							}
+							if (p) {
+								ps.unshift(p);
+							}
 							var tid = d.id.toString(),
 								i, j, c, e,
 								tmp = {
-									id			: tid,
-									text		: d.text || '',
-									icon		: d.icon !== undefined ? d.icon : true,
-									parent		: p,
-									parents		: ps,
-									children	: d.children || [],
-									children_d	: d.children_d || [],
-									data		: d.data,
-									state		: { },
-									li_attr		: { id : false },
-									a_attr		: { href : '#' },
-									original	: false
+									id: tid,
+									text: d.text || '',
+									icon: d.icon !== undefined ? d.icon : true,
+									parent: p,
+									parents: ps,
+									children: d.children || [],
+									children_d: d.children_d || [],
+									data: d.data,
+									state: { },
+									li_attr: { id: false },
+									a_attr: { href: '#' },
+									original: false
 								};
-							for(i in df) {
-								if(df.hasOwnProperty(i)) {
+							for (i in df) {
+								if (df.hasOwnProperty(i)) {
 									tmp.state[i] = df[i];
 								}
 							}
-							if(d && d.data && d.data.jstree && d.data.jstree.icon) {
+							if (d && d.data && d.data.jstree && d.data.jstree.icon) {
 								tmp.icon = d.data.jstree.icon;
 							}
-							if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
-								tmp.icon = true;
-							}
-							if(d && d.data) {
+							if (d && d.data) {
 								tmp.data = d.data;
-								if(d.data.jstree) {
-									for(i in d.data.jstree) {
-										if(d.data.jstree.hasOwnProperty(i)) {
+								if (d.data.jstree) {
+									for (i in d.data.jstree) {
+										if (d.data.jstree.hasOwnProperty(i)) {
 											tmp.state[i] = d.data.jstree[i];
 										}
 									}
 								}
 							}
-							if(d && typeof d.state === 'object') {
+							if (d && typeof d.state === 'object') {
 								for (i in d.state) {
-									if(d.state.hasOwnProperty(i)) {
+									if (d.state.hasOwnProperty(i)) {
 										tmp.state[i] = d.state[i];
 									}
 								}
 							}
-							if(d && typeof d.li_attr === 'object') {
+							if (d && typeof d.li_attr === 'object') {
 								for (i in d.li_attr) {
-									if(d.li_attr.hasOwnProperty(i)) {
+									if (d.li_attr.hasOwnProperty(i)) {
 										tmp.li_attr[i] = d.li_attr[i];
 									}
 								}
 							}
-							if(!tmp.li_attr.id) {
+							if (!tmp.li_attr.id) {
 								tmp.li_attr.id = tid;
 							}
-							if(d && typeof d.a_attr === 'object') {
+							if (d && typeof d.a_attr === 'object') {
 								for (i in d.a_attr) {
-									if(d.a_attr.hasOwnProperty(i)) {
+									if (d.a_attr.hasOwnProperty(i)) {
 										tmp.a_attr[i] = d.a_attr[i];
 									}
 								}
 							}
-							if(d && d.children && d.children === true) {
+							if (d && d.children && d.children === true) {
 								tmp.state.loaded = false;
 								tmp.children = [];
 								tmp.children_d = [];
 							}
 							m[tmp.id] = tmp;
-							for(i = 0, j = tmp.children.length; i < j; i++) {
+							for (i = 0, j = tmp.children.length; i < j; i++) {
 								c = parse_flat(m[tmp.children[i]], tmp.id, ps);
 								e = m[c];
 								tmp.children_d.push(c);
-								if(e.children_d.length) {
+								if (e.children_d.length) {
 									tmp.children_d = tmp.children_d.concat(e.children_d);
 								}
 							}
 							delete d.data;
 							delete d.children;
 							m[tmp.id].original = d;
-							if(tmp.state.selected) {
+							if (tmp.state.selected) {
 								add.push(tmp.id);
 							}
 							return tmp.id;
 						},
 						parse_nest = function (d, p, ps) {
-							if(!ps) { ps = []; }
-							else { ps = ps.concat(); }
-							if(p) { ps.unshift(p); }
+							if (!ps) {
+								ps = [];
+							}
+							else {
+								ps = ps.concat();
+							}
+							if (p) {
+								ps.unshift(p);
+							}
 							var tid = false, i, j, c, e, tmp;
 							do {
 								tid = 'j' + t_id + '_' + (++t_cnt);
-							} while(m[tid]);
+							} while (m[tid]);
 
 							tmp = {
-								id			: false,
-								text		: typeof d === 'string' ? d : '',
-								icon		: typeof d === 'object' && d.icon !== undefined ? d.icon : true,
-								parent		: p,
-								parents		: ps,
-								children	: [],
-								children_d	: [],
-								data		: null,
-								state		: { },
-								li_attr		: { id : false },
-								a_attr		: { href : '#' },
-								original	: false
+								id: false,
+								text: typeof d === 'string' ? d : '',
+								icon: typeof d === 'object' && d.icon !== undefined ? d.icon : true,
+								parent: p,
+								parents: ps,
+								children: [],
+								children_d: [],
+								data: null,
+								state: { },
+								li_attr: { id: false },
+								a_attr: { href: '#' },
+								original: false
 							};
-							for(i in df) {
-								if(df.hasOwnProperty(i)) {
+							for (i in df) {
+								if (df.hasOwnProperty(i)) {
 									tmp.state[i] = df[i];
 								}
 							}
-							if(d && d.id) { tmp.id = d.id.toString(); }
-							if(d && d.text) { tmp.text = d.text; }
-							if(d && d.data && d.data.jstree && d.data.jstree.icon) {
+							if (d && d.id) {
+								tmp.id = d.id.toString();
+							}
+							if (d && d.text) {
+								tmp.text = d.text;
+							}
+							if (d && d.data && d.data.jstree && d.data.jstree.icon) {
 								tmp.icon = d.data.jstree.icon;
 							}
-							if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
-								tmp.icon = true;
-							}
-							if(d && d.data) {
+							if (d && d.data) {
 								tmp.data = d.data;
-								if(d.data.jstree) {
-									for(i in d.data.jstree) {
-										if(d.data.jstree.hasOwnProperty(i)) {
+								if (d.data.jstree) {
+									for (i in d.data.jstree) {
+										if (d.data.jstree.hasOwnProperty(i)) {
 											tmp.state[i] = d.data.jstree[i];
 										}
 									}
 								}
 							}
-							if(d && typeof d.state === 'object') {
+							if (d && typeof d.state === 'object') {
 								for (i in d.state) {
-									if(d.state.hasOwnProperty(i)) {
+									if (d.state.hasOwnProperty(i)) {
 										tmp.state[i] = d.state[i];
 									}
 								}
 							}
-							if(d && typeof d.li_attr === 'object') {
+							if (d && typeof d.li_attr === 'object') {
 								for (i in d.li_attr) {
-									if(d.li_attr.hasOwnProperty(i)) {
+									if (d.li_attr.hasOwnProperty(i)) {
 										tmp.li_attr[i] = d.li_attr[i];
 									}
 								}
 							}
-							if(tmp.li_attr.id && !tmp.id) {
+							if (tmp.li_attr.id && !tmp.id) {
 								tmp.id = tmp.li_attr.id.toString();
 							}
-							if(!tmp.id) {
+							if (!tmp.id) {
 								tmp.id = tid;
 							}
-							if(!tmp.li_attr.id) {
+							if (!tmp.li_attr.id) {
 								tmp.li_attr.id = tmp.id;
 							}
-							if(d && typeof d.a_attr === 'object') {
+							if (d && typeof d.a_attr === 'object') {
 								for (i in d.a_attr) {
-									if(d.a_attr.hasOwnProperty(i)) {
+									if (d.a_attr.hasOwnProperty(i)) {
 										tmp.a_attr[i] = d.a_attr[i];
 									}
 								}
 							}
-							if(d && d.children && d.children.length) {
-								for(i = 0, j = d.children.length; i < j; i++) {
+							if (d && d.children && d.children.length) {
+								for (i = 0, j = d.children.length; i < j; i++) {
 									c = parse_nest(d.children[i], tmp.id, ps);
 									e = m[c];
 									tmp.children.push(c);
-									if(e.children_d.length) {
+									if (e.children_d.length) {
 										tmp.children_d = tmp.children_d.concat(e.children_d);
 									}
 								}
 								tmp.children_d = tmp.children_d.concat(tmp.children);
 							}
-							if(d && d.children && d.children === true) {
+							if (d && d.children && d.children === true) {
 								tmp.state.loaded = false;
 								tmp.children = [];
 								tmp.children_d = [];
@@ -1697,110 +1514,104 @@
 							delete d.children;
 							tmp.original = d;
 							m[tmp.id] = tmp;
-							if(tmp.state.selected) {
+							if (tmp.state.selected) {
 								add.push(tmp.id);
 							}
 							return tmp.id;
 						};
 
-					if(dat.length && dat[0].id !== undefined && dat[0].parent !== undefined) {
+					if (dat.length && dat[0].id !== undefined && dat[0].parent !== undefined) {
 						// Flat JSON support (for easy import from DB):
 						// 1) convert to object (foreach)
-						for(i = 0, j = dat.length; i < j; i++) {
-							if(!dat[i].children) {
+						for (i = 0, j = dat.length; i < j; i++) {
+							if (!dat[i].children) {
 								dat[i].children = [];
 							}
 							m[dat[i].id.toString()] = dat[i];
 						}
 						// 2) populate children (foreach)
-						for(i = 0, j = dat.length; i < j; i++) {
+						for (i = 0, j = dat.length; i < j; i++) {
 							m[dat[i].parent.toString()].children.push(dat[i].id.toString());
 							// populate parent.children_d
 							p.children_d.push(dat[i].id.toString());
 						}
 						// 3) normalize && populate parents and children_d with recursion
-						for(i = 0, j = p.children.length; i < j; i++) {
+						for (i = 0, j = p.children.length; i < j; i++) {
 							tmp = parse_flat(m[p.children[i]], par, p.parents.concat());
 							dpc.push(tmp);
-							if(m[tmp].children_d.length) {
+							if (m[tmp].children_d.length) {
 								dpc = dpc.concat(m[tmp].children_d);
 							}
 						}
-						for(i = 0, j = p.parents.length; i < j; i++) {
+						for (i = 0, j = p.parents.length; i < j; i++) {
 							m[p.parents[i]].children_d = m[p.parents[i]].children_d.concat(dpc);
 						}
 						// ?) three_state selection - p.state.selected && t - (if three_state foreach(dat => ch) -> foreach(parents) if(parent.selected) child.selected = true;
 						rslt = {
-							'cnt' : t_cnt,
-							'mod' : m,
-							'sel' : sel,
-							'par' : par,
-							'dpc' : dpc,
-							'add' : add
+							'cnt': t_cnt,
+							'mod': m,
+							'sel': sel,
+							'par': par,
+							'dpc': dpc,
+							'add': add
 						};
 					}
 					else {
-						for(i = 0, j = dat.length; i < j; i++) {
+						for (i = 0, j = dat.length; i < j; i++) {
 							tmp = parse_nest(dat[i], par, p.parents.concat());
-							if(tmp) {
+							if (tmp) {
 								chd.push(tmp);
 								dpc.push(tmp);
-								if(m[tmp].children_d.length) {
+								if (m[tmp].children_d.length) {
 									dpc = dpc.concat(m[tmp].children_d);
 								}
 							}
 						}
 						p.children = chd;
 						p.children_d = dpc;
-						for(i = 0, j = p.parents.length; i < j; i++) {
+						for (i = 0, j = p.parents.length; i < j; i++) {
 							m[p.parents[i]].children_d = m[p.parents[i]].children_d.concat(dpc);
 						}
 						rslt = {
-							'cnt' : t_cnt,
-							'mod' : m,
-							'sel' : sel,
-							'par' : par,
-							'dpc' : dpc,
-							'add' : add
+							'cnt': t_cnt,
+							'mod': m,
+							'sel': sel,
+							'par': par,
+							'dpc': dpc,
+							'add': add
 						};
 					}
-					if(typeof window === 'undefined' || typeof window.document === 'undefined') {
-						postMessage(rslt);
-					}
-					else {
-						return rslt;
-					}
+					return rslt;
 				},
 				rslt = function (rslt, worker) {
-					if(this.element === null) { return; }
 					this._cnt = rslt.cnt;
 					this._model.data = rslt.mod; // breaks the reference in load_node - careful
 
-					if(worker) {
+					if (worker) {
 						var i, j, a = rslt.add, r = rslt.sel, s = this._data.core.selected.slice(), m = this._model.data;
 						// if selection was changed while calculating in worker
-						if(r.length !== s.length || $.vakata.array_unique(r.concat(s)).length !== r.length) {
+						if (r.length !== s.length || $.vakata.array_unique(r.concat(s)).length !== r.length) {
 							// deselect nodes that are no longer selected
-							for(i = 0, j = r.length; i < j; i++) {
-								if($.inArray(r[i], a) === -1 && $.inArray(r[i], s) === -1) {
+							for (i = 0, j = r.length; i < j; i++) {
+								if ($.inArray(r[i], a) === -1 && $.inArray(r[i], s) === -1) {
 									m[r[i]].state.selected = false;
 								}
 							}
 							// select nodes that were selected in the mean time
-							for(i = 0, j = s.length; i < j; i++) {
-								if($.inArray(s[i], r) === -1) {
+							for (i = 0, j = s.length; i < j; i++) {
+								if ($.inArray(s[i], r) === -1) {
 									m[s[i]].state.selected = true;
 								}
 							}
 						}
 					}
-					if(rslt.add.length) {
+					if (rslt.add.length) {
 						this._data.core.selected = this._data.core.selected.concat(rslt.add);
 					}
 
-					this.trigger('model', { "nodes" : rslt.dpc, 'parent' : rslt.par });
+					this.trigger('model', { "nodes": rslt.dpc, 'parent': rslt.par });
 
-					if(rslt.par !== $.jstree.root) {
+					if (rslt.par !== '#') {
 						this._node_changed(rslt.par);
 						this.redraw();
 					}
@@ -1808,58 +1619,39 @@
 						// this.get_container_ul().children('.jstree-initial-node').remove();
 						this.redraw(true);
 					}
-					if(rslt.add.length) {
-						this.trigger('changed', { 'action' : 'model', 'selected' : this._data.core.selected });
+					if (rslt.add.length) {
+						this.trigger('changed', { 'action': 'model', 'selected': this._data.core.selected });
 					}
 					cb.call(this, true);
 				};
-			if(this.settings.core.worker && window.Blob && window.URL && window.Worker) {
+			if (this.settings.core.worker && window.Blob && window.URL && window.Worker) {
 				try {
-					if(this._wrk === null) {
+					if (this._wrk === null) {
 						this._wrk = window.URL.createObjectURL(
 							new window.Blob(
-								['self.onmessage = ' + func.toString()],
-								{type:"text/javascript"}
+								['self.onmessage = ' + func.toString().replace(/return ([^;}]+)[\s;}]+$/, 'postMessage($1);}')],
+								{type: "text/javascript"}
 							)
 						);
 					}
-					if(!this._data.core.working || force_processing) {
+					w = new window.Worker(this._wrk);
+					w.onmessage = $.proxy(function (e) {
+						rslt.call(this, e.data, true);
+						this._data.core.working = false;
+						if (this._data.core.worker_queue.length) {
+							this._append_json_data.apply(this, this._data.core.worker_queue.shift());
+						}
+					}, this);
+					if (!this._data.core.working) {
 						this._data.core.working = true;
-						w = new window.Worker(this._wrk);
-						w.onmessage = $.proxy(function (e) {
-							rslt.call(this, e.data, true);
-							try { w.terminate(); w = null; } catch(ignore) { }
-							if(this._data.core.worker_queue.length) {
-								this._append_json_data.apply(this, this._data.core.worker_queue.shift());
-							}
-							else {
-								this._data.core.working = false;
-							}
-						}, this);
-						if(!args.par) {
-							if(this._data.core.worker_queue.length) {
-								this._append_json_data.apply(this, this._data.core.worker_queue.shift());
-							}
-							else {
-								this._data.core.working = false;
-							}
-						}
-						else {
-							w.postMessage(args);
-						}
+						w.postMessage(args);
 					}
 					else {
-						this._data.core.worker_queue.push([dom, data, cb, true]);
+						this._data.core.worker_queue.push([dom, data, cb]);
 					}
 				}
-				catch(e) {
+				catch (e) {
 					rslt.call(this, func(args), false);
-					if(this._data.core.worker_queue.length) {
-						this._append_json_data.apply(this, this._data.core.worker_queue.shift());
-					}
-					else {
-						this._data.core.working = false;
-					}
 				}
 			}
 			else {
@@ -1875,50 +1667,58 @@
 		 * @param  {Array} ps list of all parents
 		 * @return {String} the ID of the object added to the model
 		 */
-		_parse_model_from_html : function (d, p, ps) {
-			if(!ps) { ps = []; }
-			else { ps = [].concat(ps); }
-			if(p) { ps.unshift(p); }
+		_parse_model_from_html: function (d, p, ps) {
+			if (!ps) {
+				ps = [];
+			}
+			else {
+				ps = [].concat(ps);
+			}
+			if (p) {
+				ps.unshift(p);
+			}
 			var c, e, m = this._model.data,
 				data = {
-					id			: false,
-					text		: false,
-					icon		: true,
-					parent		: p,
-					parents		: ps,
-					children	: [],
-					children_d	: [],
-					data		: null,
-					state		: { },
-					li_attr		: { id : false },
-					a_attr		: { href : '#' },
-					original	: false
+					id: false,
+					text: false,
+					icon: true,
+					parent: p,
+					parents: ps,
+					children: [],
+					children_d: [],
+					data: null,
+					state: { },
+					li_attr: { id: false },
+					a_attr: { href: '#' },
+					original: false
 				}, i, tmp, tid;
-			for(i in this._model.default_state) {
-				if(this._model.default_state.hasOwnProperty(i)) {
+			for (i in this._model.default_state) {
+				if (this._model.default_state.hasOwnProperty(i)) {
 					data.state[i] = this._model.default_state[i];
 				}
 			}
 			tmp = $.vakata.attributes(d, true);
 			$.each(tmp, function (i, v) {
 				v = $.trim(v);
-				if(!v.length) { return true; }
+				if (!v.length) {
+					return true;
+				}
 				data.li_attr[i] = v;
-				if(i === 'id') {
+				if (i === 'id') {
 					data.id = v.toString();
 				}
 			});
-			tmp = d.children('a').first();
-			if(tmp.length) {
+			tmp = d.children('a').eq(0);
+			if (tmp.length) {
 				tmp = $.vakata.attributes(tmp, true);
 				$.each(tmp, function (i, v) {
 					v = $.trim(v);
-					if(v.length) {
+					if (v.length) {
 						data.a_attr[i] = v;
 					}
 				});
 			}
-			tmp = d.children("a").first().length ? d.children("a").first().clone() : d.clone();
+			tmp = d.children("a:eq(0)").length ? d.children("a:eq(0)").clone() : d.clone();
 			tmp.children("ins, i, ul").remove();
 			tmp = tmp.html();
 			tmp = $('<div />').html(tmp);
@@ -1928,52 +1728,49 @@
 			data.state.opened = d.hasClass('jstree-open');
 			data.state.selected = d.children('a').hasClass('jstree-clicked');
 			data.state.disabled = d.children('a').hasClass('jstree-disabled');
-			if(data.data && data.data.jstree) {
-				for(i in data.data.jstree) {
-					if(data.data.jstree.hasOwnProperty(i)) {
+			if (data.data && data.data.jstree) {
+				for (i in data.data.jstree) {
+					if (data.data.jstree.hasOwnProperty(i)) {
 						data.state[i] = data.data.jstree[i];
 					}
 				}
 			}
 			tmp = d.children("a").children(".jstree-themeicon");
-			if(tmp.length) {
+			if (tmp.length) {
 				data.icon = tmp.hasClass('jstree-themeicon-hidden') ? false : tmp.attr('rel');
 			}
-			if(data.state.icon !== undefined) {
+			if (data.state.icon) {
 				data.icon = data.state.icon;
 			}
-			if(data.icon === undefined || data.icon === null || data.icon === "") {
-				data.icon = true;
-			}
 			tmp = d.children("ul").children("li");
 			do {
 				tid = 'j' + this._id + '_' + (++this._cnt);
-			} while(m[tid]);
+			} while (m[tid]);
 			data.id = data.li_attr.id ? data.li_attr.id.toString() : tid;
-			if(tmp.length) {
+			if (tmp.length) {
 				tmp.each($.proxy(function (i, v) {
 					c = this._parse_model_from_html($(v), data.id, ps);
 					e = this._model.data[c];
 					data.children.push(c);
-					if(e.children_d.length) {
+					if (e.children_d.length) {
 						data.children_d = data.children_d.concat(e.children_d);
 					}
 				}, this));
 				data.children_d = data.children_d.concat(data.children);
 			}
 			else {
-				if(d.hasClass('jstree-closed')) {
+				if (d.hasClass('jstree-closed')) {
 					data.state.loaded = false;
 				}
 			}
-			if(data.li_attr['class']) {
-				data.li_attr['class'] = data.li_attr['class'].replace('jstree-closed','').replace('jstree-open','');
+			if (data.li_attr['class']) {
+				data.li_attr['class'] = data.li_attr['class'].replace('jstree-closed', '').replace('jstree-open', '');
 			}
-			if(data.a_attr['class']) {
-				data.a_attr['class'] = data.a_attr['class'].replace('jstree-clicked','').replace('jstree-disabled','');
+			if (data.a_attr['class']) {
+				data.a_attr['class'] = data.a_attr['class'].replace('jstree-clicked', '').replace('jstree-disabled', '');
 			}
 			m[data.id] = data;
-			if(data.state.selected) {
+			if (data.state.selected) {
 				this._data.core.selected.push(data.id);
 			}
 			return data.id;
@@ -1987,91 +1784,94 @@
 		 * @param  {Array} ps list of all parents
 		 * @return {String} the ID of the object added to the model
 		 */
-		_parse_model_from_flat_json : function (d, p, ps) {
-			if(!ps) { ps = []; }
-			else { ps = ps.concat(); }
-			if(p) { ps.unshift(p); }
+		_parse_model_from_flat_json: function (d, p, ps) {
+			if (!ps) {
+				ps = [];
+			}
+			else {
+				ps = ps.concat();
+			}
+			if (p) {
+				ps.unshift(p);
+			}
 			var tid = d.id.toString(),
 				m = this._model.data,
 				df = this._model.default_state,
 				i, j, c, e,
 				tmp = {
-					id			: tid,
-					text		: d.text || '',
-					icon		: d.icon !== undefined ? d.icon : true,
-					parent		: p,
-					parents		: ps,
-					children	: d.children || [],
-					children_d	: d.children_d || [],
-					data		: d.data,
-					state		: { },
-					li_attr		: { id : false },
-					a_attr		: { href : '#' },
-					original	: false
+					id: tid,
+					text: d.text || '',
+					icon: d.icon !== undefined ? d.icon : true,
+					parent: p,
+					parents: ps,
+					children: d.children || [],
+					children_d: d.children_d || [],
+					data: d.data,
+					state: { },
+					li_attr: { id: false },
+					a_attr: { href: '#' },
+					original: false
 				};
-			for(i in df) {
-				if(df.hasOwnProperty(i)) {
+			for (i in df) {
+				if (df.hasOwnProperty(i)) {
 					tmp.state[i] = df[i];
 				}
 			}
-			if(d && d.data && d.data.jstree && d.data.jstree.icon) {
+			if (d && d.data && d.data.jstree && d.data.jstree.icon) {
 				tmp.icon = d.data.jstree.icon;
 			}
-			if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
-				tmp.icon = true;
-			}
-			if(d && d.data) {
+			if (d && d.data) {
 				tmp.data = d.data;
-				if(d.data.jstree) {
-					for(i in d.data.jstree) {
-						if(d.data.jstree.hasOwnProperty(i)) {
+				if (d.data.jstree) {
+					for (i in d.data.jstree) {
+						if (d.data.jstree.hasOwnProperty(i)) {
 							tmp.state[i] = d.data.jstree[i];
 						}
 					}
 				}
 			}
-			if(d && typeof d.state === 'object') {
+			if (d && typeof d.state === 'object') {
 				for (i in d.state) {
-					if(d.state.hasOwnProperty(i)) {
+					if (d.state.hasOwnProperty(i)) {
 						tmp.state[i] = d.state[i];
 					}
 				}
 			}
-			if(d && typeof d.li_attr === 'object') {
+			if (d && typeof d.li_attr === 'object') {
 				for (i in d.li_attr) {
-					if(d.li_attr.hasOwnProperty(i)) {
+					if (d.li_attr.hasOwnProperty(i)) {
 						tmp.li_attr[i] = d.li_attr[i];
 					}
 				}
 			}
-			if(!tmp.li_attr.id) {
+			if (!tmp.li_attr.id) {
 				tmp.li_attr.id = tid;
 			}
-			if(d && typeof d.a_attr === 'object') {
+			if (d && typeof d.a_attr === 'object') {
 				for (i in d.a_attr) {
-					if(d.a_attr.hasOwnProperty(i)) {
+					if (d.a_attr.hasOwnProperty(i)) {
 						tmp.a_attr[i] = d.a_attr[i];
 					}
 				}
 			}
-			if(d && d.children && d.children === true) {
+			if (d && d.children && d.children === true) {
 				tmp.state.loaded = false;
 				tmp.children = [];
 				tmp.children_d = [];
 			}
 			m[tmp.id] = tmp;
-			for(i = 0, j = tmp.children.length; i < j; i++) {
+			for (i = 0, j = tmp.children.length; i < j; i++) {
 				c = this._parse_model_from_flat_json(m[tmp.children[i]], tmp.id, ps);
 				e = m[c];
 				tmp.children_d.push(c);
-				if(e.children_d.length) {
+				if (e.children_d.length) {
 					tmp.children_d = tmp.children_d.concat(e.children_d);
 				}
 			}
 			delete d.data;
 			delete d.children;
 			m[tmp.id].original = d;
-			if(tmp.state.selected) {
+			if (tmp.state.selected) {
 				this._data.core.selected.push(tmp.id);
 			}
 			return tmp.id;
@@ -2085,94 +1885,101 @@
 		 * @param  {Array} ps list of all parents
 		 * @return {String} the ID of the object added to the model
 		 */
-		_parse_model_from_json : function (d, p, ps) {
-			if(!ps) { ps = []; }
-			else { ps = ps.concat(); }
-			if(p) { ps.unshift(p); }
+		_parse_model_from_json: function (d, p, ps) {
+			if (!ps) {
+				ps = [];
+			}
+			else {
+				ps = ps.concat();
+			}
+			if (p) {
+				ps.unshift(p);
+			}
 			var tid = false, i, j, c, e, m = this._model.data, df = this._model.default_state, tmp;
 			do {
 				tid = 'j' + this._id + '_' + (++this._cnt);
-			} while(m[tid]);
+			} while (m[tid]);
 
 			tmp = {
-				id			: false,
-				text		: typeof d === 'string' ? d : '',
-				icon		: typeof d === 'object' && d.icon !== undefined ? d.icon : true,
-				parent		: p,
-				parents		: ps,
-				children	: [],
-				children_d	: [],
-				data		: null,
-				state		: { },
-				li_attr		: { id : false },
-				a_attr		: { href : '#' },
-				original	: false
+				id: false,
+				text: typeof d === 'string' ? d : '',
+				icon: typeof d === 'object' && d.icon !== undefined ? d.icon : true,
+				parent: p,
+				parents: ps,
+				children: [],
+				children_d: [],
+				data: null,
+				state: { },
+				li_attr: { id: false },
+				a_attr: { href: '#' },
+				original: false
 			};
-			for(i in df) {
-				if(df.hasOwnProperty(i)) {
+			for (i in df) {
+				if (df.hasOwnProperty(i)) {
 					tmp.state[i] = df[i];
 				}
 			}
-			if(d && d.id) { tmp.id = d.id.toString(); }
-			if(d && d.text) { tmp.text = d.text; }
-			if(d && d.data && d.data.jstree && d.data.jstree.icon) {
+			if (d && d.id) {
+				tmp.id = d.id.toString();
+			}
+			if (d && d.text) {
+				tmp.text = d.text;
+			}
+			if (d && d.data && d.data.jstree && d.data.jstree.icon) {
 				tmp.icon = d.data.jstree.icon;
 			}
-			if(tmp.icon === undefined || tmp.icon === null || tmp.icon === "") {
-				tmp.icon = true;
-			}
-			if(d && d.data) {
+			if (d && d.data) {
 				tmp.data = d.data;
-				if(d.data.jstree) {
-					for(i in d.data.jstree) {
-						if(d.data.jstree.hasOwnProperty(i)) {
+				if (d.data.jstree) {
+					for (i in d.data.jstree) {
+						if (d.data.jstree.hasOwnProperty(i)) {
 							tmp.state[i] = d.data.jstree[i];
 						}
 					}
 				}
 			}
-			if(d && typeof d.state === 'object') {
+			if (d && typeof d.state === 'object') {
 				for (i in d.state) {
-					if(d.state.hasOwnProperty(i)) {
+					if (d.state.hasOwnProperty(i)) {
 						tmp.state[i] = d.state[i];
 					}
 				}
 			}
-			if(d && typeof d.li_attr === 'object') {
+			if (d && typeof d.li_attr === 'object') {
 				for (i in d.li_attr) {
-					if(d.li_attr.hasOwnProperty(i)) {
+					if (d.li_attr.hasOwnProperty(i)) {
 						tmp.li_attr[i] = d.li_attr[i];
 					}
 				}
 			}
-			if(tmp.li_attr.id && !tmp.id) {
+			if (tmp.li_attr.id && !tmp.id) {
 				tmp.id = tmp.li_attr.id.toString();
 			}
-			if(!tmp.id) {
+			if (!tmp.id) {
 				tmp.id = tid;
 			}
-			if(!tmp.li_attr.id) {
+			if (!tmp.li_attr.id) {
 				tmp.li_attr.id = tmp.id;
 			}
-			if(d && typeof d.a_attr === 'object') {
+			if (d && typeof d.a_attr === 'object') {
 				for (i in d.a_attr) {
-					if(d.a_attr.hasOwnProperty(i)) {
+					if (d.a_attr.hasOwnProperty(i)) {
 						tmp.a_attr[i] = d.a_attr[i];
 					}
 				}
 			}
-			if(d && d.children && d.children.length) {
-				for(i = 0, j = d.children.length; i < j; i++) {
+			if (d && d.children && d.children.length) {
+				for (i = 0, j = d.children.length; i < j; i++) {
 					c = this._parse_model_from_json(d.children[i], tmp.id, ps);
 					e = m[c];
 					tmp.children.push(c);
-					if(e.children_d.length) {
+					if (e.children_d.length) {
 						tmp.children_d = tmp.children_d.concat(e.children_d);
 					}
 				}
 				tmp.children_d = tmp.children_d.concat(tmp.children);
 			}
-			if(d && d.children && d.children === true) {
+			if (d && d.children && d.children === true) {
 				tmp.state.loaded = false;
 				tmp.children = [];
 				tmp.children_d = [];
@@ -2181,7 +1988,7 @@
 			delete d.children;
 			tmp.original = d;
 			m[tmp.id] = tmp;
-			if(tmp.state.selected) {
+			if (tmp.state.selected) {
 				this._data.core.selected.push(tmp.id);
 			}
 			return tmp.id;
@@ -2192,30 +1999,20 @@
 		 * @name _redraw()
 		 * @trigger redraw.jstree
 		 */
-		_redraw : function () {
-			var nodes = this._model.force_full_redraw ? this._model.data[$.jstree.root].children.concat([]) : this._model.changed.concat([]),
-				f = document.createElement('UL'), tmp, i, j, fe = this._data.core.focused;
-			for(i = 0, j = nodes.length; i < j; i++) {
+		_redraw: function () {
+			var nodes = this._model.force_full_redraw ? this._model.data['#'].children.concat([]) : this._model.changed.concat([]),
+				f = document.createElement('UL'), tmp, i, j;
+			for (i = 0, j = nodes.length; i < j; i++) {
 				tmp = this.redraw_node(nodes[i], true, this._model.force_full_redraw);
-				if(tmp && this._model.force_full_redraw) {
+				if (tmp && this._model.force_full_redraw) {
 					f.appendChild(tmp);
 				}
 			}
-			if(this._model.force_full_redraw) {
+			if (this._model.force_full_redraw) {
 				f.className = this.get_container_ul()[0].className;
-				f.setAttribute('role','group');
 				this.element.empty().append(f);
 				//this.get_container_ul()[0].appendChild(f);
 			}
-			if(fe !== null) {
-				tmp = this.get_node(fe, true);
-				if(tmp && tmp.length && tmp.children('.jstree-anchor')[0] !== document.activeElement) {
-					tmp.children('.jstree-anchor').focus();
-				}
-				else {
-					this._data.core.focused = null;
-				}
-			}
 			this._model.force_full_redraw = false;
 			this._model.changed = [];
 			/**
@@ -2224,15 +2021,15 @@
 			 * @name redraw.jstree
 			 * @param {array} nodes the redrawn nodes
 			 */
-			this.trigger('redraw', { "nodes" : nodes });
+			this.trigger('redraw', { "nodes": nodes });
 		},
 		/**
 		 * redraws all nodes that need to be redrawn or optionally - the whole tree
 		 * @name redraw([full])
 		 * @param {Boolean} full if set to `true` all nodes are redrawn.
 		 */
-		redraw : function (full) {
-			if(full) {
+		redraw: function (full) {
+			if (full) {
 				this._model.force_full_redraw = true;
 			}
 			//if(this._model.redraw_timeout) {
@@ -2241,45 +2038,15 @@
 			//this._model.redraw_timeout = setTimeout($.proxy(this._redraw, this),0);
 			this._redraw();
 		},
-		/**
-		 * redraws a single node's children. Used internally.
-		 * @private
-		 * @name draw_children(node)
-		 * @param {mixed} node the node whose children will be redrawn
-		 */
-		draw_children : function (node) {
-			var obj = this.get_node(node),
-				i = false,
-				j = false,
-				k = false,
-				d = document;
-			if(!obj) { return false; }
-			if(obj.id === $.jstree.root) { return this.redraw(true); }
-			node = this.get_node(node, true);
-			if(!node || !node.length) { return false; } // TODO: quick toggle
-
-			node.children('.jstree-children').remove();
-			node = node[0];
-			if(obj.children.length && obj.state.loaded) {
-				k = d.createElement('UL');
-				k.setAttribute('role', 'group');
-				k.className = 'jstree-children';
-				for(i = 0, j = obj.children.length; i < j; i++) {
-					k.appendChild(this.redraw_node(obj.children[i], true, true));
-				}
-				node.appendChild(k);
-			}
-		},
 		/**
 		 * redraws a single node. Used internally.
 		 * @private
-		 * @name redraw_node(node, deep, is_callback, force_render)
+		 * @name redraw_node(node, deep, is_callback)
 		 * @param {mixed} node the node to redraw
 		 * @param {Boolean} deep should child nodes be redrawn too
 		 * @param {Boolean} is_callback is this a recursion call
-		 * @param {Boolean} force_render should children of closed parents be drawn anyway
 		 */
-		redraw_node : function (node, deep, is_callback, force_render) {
+		redraw_node: function (node, deep, is_callback) {
 			var obj = this.get_node(node),
 				par = false,
 				ind = false,
@@ -2292,42 +2059,43 @@
 				m = this._model.data,
 				f = false,
 				s = false,
-				tmp = null,
-				t = 0,
-				l = 0,
-				has_children = false,
-				last_sibling = false;
-			if(!obj) { return false; }
-			if(obj.id === $.jstree.root) {  return this.redraw(true); }
+				tmp = null;
+			if (!obj) {
+				return false;
+			}
+			if (obj.id === '#') {
+				return this.redraw(true);
+			}
 			deep = deep || obj.children.length === 0;
-			node = !document.querySelector ? document.getElementById(obj.id) : this.element[0].querySelector('#' + ("0123456789".indexOf(obj.id[0]) !== -1 ? '\\3' + obj.id[0] + ' ' + obj.id.substr(1).replace($.jstree.idregex,'\\$&') : obj.id.replace($.jstree.idregex,'\\$&')) ); //, this.element);
-			if(!node) {
+			node = !document.querySelector ? document.getElementById(obj.id) : this.element[0].querySelector('#' + ("0123456789".indexOf(obj.id[0]) !== -1 ? '\\3' + obj.id[0] + ' ' + obj.id.substr(1).replace($.jstree.idregex, '\\$&') : obj.id.replace($.jstree.idregex, '\\$&'))); //, this.element);
+			if (!node) {
 				deep = true;
 				//node = d.createElement('LI');
-				if(!is_callback) {
-					par = obj.parent !== $.jstree.root ? $('#' + obj.parent.replace($.jstree.idregex,'\\$&'), this.element)[0] : null;
-					if(par !== null && (!par || !m[obj.parent].state.opened)) {
+				if (!is_callback) {
+					par = obj.parent !== '#' ? $('#' + obj.parent.replace($.jstree.idregex, '\\$&'), this.element)[0] : null;
+					if (par !== null && (!par || !m[obj.parent].state.opened)) {
 						return false;
 					}
-					ind = $.inArray(obj.id, par === null ? m[$.jstree.root].children : m[obj.parent].children);
+					ind = $.inArray(obj.id, par === null ? m['#'].children : m[obj.parent].children);
 				}
 			}
 			else {
 				node = $(node);
-				if(!is_callback) {
+				if (!is_callback) {
 					par = node.parent().parent()[0];
-					if(par === this.element[0]) {
+					if (par === this.element[0]) {
 						par = null;
 					}
 					ind = node.index();
 				}
 				// m[obj.id].data = node.data(); // use only node's data, no need to touch jquery storage
-				if(!deep && obj.children.length && !node.children('.jstree-children').length) {
+				if (!deep && obj.children.length && !node.children('.jstree-children').length) {
 					deep = true;
 				}
-				if(!deep) {
+				if (!deep) {
 					old = node.children('.jstree-children')[0];
 				}
+				s = node.attr('aria-selected');
 				f = node.children('.jstree-anchor')[0] === document.activeElement;
 				node.remove();
 				//node = d.createElement('LI');
@@ -2337,10 +2105,12 @@
 			// node is DOM, deep is boolean
 
 			c = 'jstree-node ';
-			for(i in obj.li_attr) {
-				if(obj.li_attr.hasOwnProperty(i)) {
-					if(i === 'id') { continue; }
-					if(i !== 'class') {
+			for (i in obj.li_attr) {
+				if (obj.li_attr.hasOwnProperty(i)) {
+					if (i === 'id') {
+						continue;
+					}
+					if (i !== 'class') {
 						node.setAttribute(i, obj.li_attr[i]);
 					}
 					else {
@@ -2348,58 +2118,28 @@
 					}
 				}
 			}
-			if(!obj.a_attr.id) {
-				obj.a_attr.id = obj.id + '_anchor';
+			if (s && s !== "false") {
+				node.setAttribute('aria-selected', true);
 			}
-			node.setAttribute('aria-selected', !!obj.state.selected);
-			node.setAttribute('aria-level', obj.parents.length);
-			node.setAttribute('aria-labelledby', obj.a_attr.id);
-			if(obj.state.disabled) {
-				node.setAttribute('aria-disabled', true);
-			}
-
-			for(i = 0, j = obj.children.length; i < j; i++) {
-				if(!m[obj.children[i]].state.hidden) {
-					has_children = true;
-					break;
-				}
-			}
-			if(obj.parent !== null && m[obj.parent] && !obj.state.hidden) {
-				i = $.inArray(obj.id, m[obj.parent].children);
-				last_sibling = obj.id;
-				if(i !== -1) {
-					i++;
-					for(j = m[obj.parent].children.length; i < j; i++) {
-						if(!m[m[obj.parent].children[i]].state.hidden) {
-							last_sibling = m[obj.parent].children[i];
-						}
-						if(last_sibling !== obj.id) {
-							break;
-						}
-					}
-				}
-			}
-
-			if(obj.state.hidden) {
-				c += ' jstree-hidden';
-			}
-			if(obj.state.loaded && !has_children) {
+			if (obj.state.loaded && !obj.children.length) {
 				c += ' jstree-leaf';
 			}
 			else {
 				c += obj.state.opened && obj.state.loaded ? ' jstree-open' : ' jstree-closed';
-				node.setAttribute('aria-expanded', (obj.state.opened && obj.state.loaded) );
+				node.setAttribute('aria-expanded', (obj.state.opened && obj.state.loaded));
 			}
-			if(last_sibling === obj.id) {
+			if (obj.parent !== null && m[obj.parent].children[m[obj.parent].children.length - 1] === obj.id) {
 				c += ' jstree-last';
 			}
 			node.id = obj.id;
 			node.className = c;
 			c = ( obj.state.selected ? ' jstree-clicked' : '') + ( obj.state.disabled ? ' jstree-disabled' : '');
-			for(j in obj.a_attr) {
-				if(obj.a_attr.hasOwnProperty(j)) {
-					if(j === 'href' && obj.a_attr[j] === '#') { continue; }
-					if(j !== 'class') {
+			for (j in obj.a_attr) {
+				if (obj.a_attr.hasOwnProperty(j)) {
+					if (j === 'href' && obj.a_attr[j] === '#') {
+						continue;
+					}
+					if (j !== 'class') {
 						node.childNodes[1].setAttribute(j, obj.a_attr[j]);
 					}
 					else {
@@ -2407,56 +2147,55 @@
 					}
 				}
 			}
-			if(c.length) {
+			if (c.length) {
 				node.childNodes[1].className = 'jstree-anchor ' + c;
 			}
-			if((obj.icon && obj.icon !== true) || obj.icon === false) {
-				if(obj.icon === false) {
+			if ((obj.icon && obj.icon !== true) || obj.icon === false) {
+				if (obj.icon === false) {
 					node.childNodes[1].childNodes[0].className += ' jstree-themeicon-hidden';
 				}
-				else if(obj.icon.indexOf('/') === -1 && obj.icon.indexOf('.') === -1) {
+				else if (obj.icon.indexOf('/') === -1 && obj.icon.indexOf('.') === -1) {
 					node.childNodes[1].childNodes[0].className += ' ' + obj.icon + ' jstree-themeicon-custom';
 				}
 				else {
-					node.childNodes[1].childNodes[0].style.backgroundImage = 'url('+obj.icon+')';
+					node.childNodes[1].childNodes[0].style.backgroundImage = 'url(' + obj.icon + ')';
 					node.childNodes[1].childNodes[0].style.backgroundPosition = 'center center';
 					node.childNodes[1].childNodes[0].style.backgroundSize = 'auto';
 					node.childNodes[1].childNodes[0].className += ' jstree-themeicon-custom';
 				}
 			}
 
-			if(this.settings.core.force_text) {
+			if (this.settings.core.force_text) {
 				node.childNodes[1].appendChild(d.createTextNode(obj.text));
 			}
 			else {
 				node.childNodes[1].innerHTML += obj.text;
 			}
 
-
-			if(deep && obj.children.length && (obj.state.opened || force_render) && obj.state.loaded) {
+			if (deep && obj.children.length && obj.state.opened && obj.state.loaded) {
 				k = d.createElement('UL');
 				k.setAttribute('role', 'group');
 				k.className = 'jstree-children';
-				for(i = 0, j = obj.children.length; i < j; i++) {
+				for (i = 0, j = obj.children.length; i < j; i++) {
 					k.appendChild(this.redraw_node(obj.children[i], deep, true));
 				}
 				node.appendChild(k);
 			}
-			if(old) {
+			if (old) {
 				node.appendChild(old);
 			}
-			if(!is_callback) {
+			if (!is_callback) {
 				// append back using par / ind
-				if(!par) {
+				if (!par) {
 					par = this.element[0];
 				}
-				for(i = 0, j = par.childNodes.length; i < j; i++) {
-					if(par.childNodes[i] && par.childNodes[i].className && par.childNodes[i].className.indexOf('jstree-children') !== -1) {
+				for (i = 0, j = par.childNodes.length; i < j; i++) {
+					if (par.childNodes[i] && par.childNodes[i].className && par.childNodes[i].className.indexOf('jstree-children') !== -1) {
 						tmp = par.childNodes[i];
 						break;
 					}
 				}
-				if(!tmp) {
+				if (!tmp) {
 					tmp = d.createElement('UL');
 					tmp.setAttribute('role', 'group');
 					tmp.className = 'jstree-children';
@@ -2464,21 +2203,17 @@
 				}
 				par = tmp;
 
-				if(ind < par.childNodes.length) {
+				if (ind < par.childNodes.length) {
 					par.insertBefore(node, par.childNodes[ind]);
 				}
 				else {
 					par.appendChild(node);
 				}
-				if(f) {
-					t = this.element[0].scrollTop;
-					l = this.element[0].scrollLeft;
+				if (f) {
 					node.childNodes[1].focus();
-					this.element[0].scrollTop = t;
-					this.element[0].scrollLeft = l;
 				}
 			}
-			if(obj.state.opened && !obj.state.loaded) {
+			if (obj.state.opened && !obj.state.loaded) {
 				obj.state.opened = false;
 				setTimeout($.proxy(function () {
 					this.open_node(obj.id, false, 0);
@@ -2494,28 +2229,28 @@
 		 * @param {Number} animation the animation duration in milliseconds when opening the node (overrides the `core.animation` setting). Use `false` for no animation.
 		 * @trigger open_node.jstree, after_open.jstree, before_open.jstree
 		 */
-		open_node : function (obj, callback, animation) {
+		open_node: function (obj, callback, animation) {
 			var t1, t2, d, t;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.open_node(obj[t1], callback, animation);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			animation = animation === undefined ? this.settings.core.animation : animation;
-			if(!this.is_closed(obj)) {
-				if(callback) {
+			if (!this.is_closed(obj)) {
+				if (callback) {
 					callback.call(this, obj, false);
 				}
 				return false;
 			}
-			if(!this.is_loaded(obj)) {
-				if(this.is_loading(obj)) {
+			if (!this.is_loaded(obj)) {
+				if (this.is_loading(obj)) {
 					return setTimeout($.proxy(function () {
 						this.open_node(obj, callback, animation);
 					}, this), 500);
@@ -2527,43 +2262,41 @@
 			else {
 				d = this.get_node(obj, true);
 				t = this;
-				if(d.length) {
-					if(animation && d.children(".jstree-children").length) {
-						d.children(".jstree-children").stop(true, true);
+				if (d.length) {
+					if (obj.children.length && !this._firstChild(d.children('.jstree-children')[0])) {
+						obj.state.opened = true;
+						this.redraw_node(obj, true);
+						d = this.get_node(obj, true);
 					}
-					if(obj.children.length && !this._firstChild(d.children('.jstree-children')[0])) {
-						this.draw_children(obj);
-						//d = this.get_node(obj, true);
-					}
-					if(!animation) {
-						this.trigger('before_open', { "node" : obj });
+					if (!animation) {
+						this.trigger('before_open', { "node": obj });
 						d[0].className = d[0].className.replace('jstree-closed', 'jstree-open');
 						d[0].setAttribute("aria-expanded", true);
 					}
 					else {
-						this.trigger('before_open', { "node" : obj });
+						this.trigger('before_open', { "node": obj });
 						d
-							.children(".jstree-children").css("display","none").end()
+							.children(".jstree-children").css("display", "none").end()
 							.removeClass("jstree-closed").addClass("jstree-open").attr("aria-expanded", true)
 							.children(".jstree-children").stop(true, true)
-								.slideDown(animation, function () {
-									this.style.display = "";
-									t.trigger("after_open", { "node" : obj });
-								});
+							.slideDown(animation, function () {
+								this.style.display = "";
+								t.trigger("after_open", { "node": obj });
+							});
 					}
 				}
 				obj.state.opened = true;
-				if(callback) {
+				if (callback) {
 					callback.call(this, obj, true);
 				}
-				if(!d.length) {
+				if (!d.length) {
 					/**
 					 * triggered when a node is about to be opened (if the node is supposed to be in the DOM, it will be, but it won't be visible yet)
 					 * @event
 					 * @name before_open.jstree
 					 * @param {Object} node the opened node
 					 */
-					this.trigger('before_open', { "node" : obj });
+					this.trigger('before_open', { "node": obj });
 				}
 				/**
 				 * triggered when a node is opened (if there is an animation it will not be completed yet)
@@ -2571,15 +2304,15 @@
 				 * @name open_node.jstree
 				 * @param {Object} node the opened node
 				 */
-				this.trigger('open_node', { "node" : obj });
-				if(!animation || !d.length) {
+				this.trigger('open_node', { "node": obj });
+				if (!animation || !d.length) {
 					/**
 					 * triggered when a node is opened and the animation is complete
 					 * @event
 					 * @name after_open.jstree
 					 * @param {Object} node the opened node
 					 */
-					this.trigger("after_open", { "node" : obj });
+					this.trigger("after_open", { "node": obj });
 				}
 			}
 		},
@@ -2589,18 +2322,18 @@
 		 * @param {mixed} obj the node to reveal
 		 * @private
 		 */
-		_open_to : function (obj) {
+		_open_to: function (obj) {
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			var i, j, p = obj.parents;
-			for(i = 0, j = p.length; i < j; i+=1) {
-				if(i !== $.jstree.root) {
+			for (i = 0, j = p.length; i < j; i += 1) {
+				if (i !== '#') {
 					this.open_node(p[i], false, 0);
 				}
 			}
-			return $('#' + obj.id.replace($.jstree.idregex,'\\$&'), this.element);
+			return $('#' + obj.id.replace($.jstree.idregex, '\\$&'), this.element);
 		},
 		/**
 		 * closes a node, hiding its children
@@ -2609,39 +2342,39 @@
 		 * @param {Number} animation the animation duration in milliseconds when closing the node (overrides the `core.animation` setting). Use `false` for no animation.
 		 * @trigger close_node.jstree, after_close.jstree
 		 */
-		close_node : function (obj, animation) {
+		close_node: function (obj, animation) {
 			var t1, t2, t, d;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.close_node(obj[t1], animation);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
-			if(this.is_closed(obj)) {
+			if (this.is_closed(obj)) {
 				return false;
 			}
 			animation = animation === undefined ? this.settings.core.animation : animation;
 			t = this;
 			d = this.get_node(obj, true);
-			if(d.length) {
-				if(!animation) {
+			if (d.length) {
+				if (!animation) {
 					d[0].className = d[0].className.replace('jstree-open', 'jstree-closed');
 					d.attr("aria-expanded", false).children('.jstree-children').remove();
 				}
 				else {
 					d
-						.children(".jstree-children").attr("style","display:block !important").end()
+						.children(".jstree-children").attr("style", "display:block !important").end()
 						.removeClass("jstree-open").addClass("jstree-closed").attr("aria-expanded", false)
 						.children(".jstree-children").stop(true, true).slideUp(animation, function () {
-							this.style.display = "";
-							d.children('.jstree-children').remove();
-							t.trigger("after_close", { "node" : obj });
-						});
+						this.style.display = "";
+						d.children('.jstree-children').remove();
+						t.trigger("after_close", { "node": obj });
+					});
 				}
 			}
 			obj.state.opened = false;
@@ -2651,15 +2384,15 @@
 			 * @name close_node.jstree
 			 * @param {Object} node the closed node
 			 */
-			this.trigger('close_node',{ "node" : obj });
-			if(!animation || !d.length) {
+			this.trigger('close_node', { "node": obj });
+			if (!animation || !d.length) {
 				/**
 				 * triggered when a node is closed and the animation is complete
 				 * @event
 				 * @name after_close.jstree
 				 * @param {Object} node the closed node
 				 */
-				this.trigger("after_close", { "node" : obj });
+				this.trigger("after_close", { "node": obj });
 			}
 		},
 		/**
@@ -2667,19 +2400,19 @@
 		 * @name toggle_node(obj)
 		 * @param {mixed} obj the node to toggle
 		 */
-		toggle_node : function (obj) {
+		toggle_node: function (obj) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.toggle_node(obj[t1]);
 				}
 				return true;
 			}
-			if(this.is_closed(obj)) {
+			if (this.is_closed(obj)) {
 				return this.open_node(obj);
 			}
-			if(this.is_open(obj)) {
+			if (this.is_open(obj)) {
 				return this.close_node(obj);
 			}
 		},
@@ -2691,18 +2424,22 @@
 		 * @param {jQuery} reference to the node that started the process (internal use)
 		 * @trigger open_all.jstree
 		 */
-		open_all : function (obj, animation, original_obj) {
-			if(!obj) { obj = $.jstree.root; }
+		open_all: function (obj, animation, original_obj) {
+			if (!obj) {
+				obj = '#';
+			}
 			obj = this.get_node(obj);
-			if(!obj) { return false; }
-			var dom = obj.id === $.jstree.root ? this.get_container_ul() : this.get_node(obj, true), i, j, _this;
-			if(!dom.length) {
-				for(i = 0, j = obj.children_d.length; i < j; i++) {
-					if(this.is_closed(this._model.data[obj.children_d[i]])) {
+			if (!obj) {
+				return false;
+			}
+			var dom = obj.id === '#' ? this.get_container_ul() : this.get_node(obj, true), i, j, _this;
+			if (!dom.length) {
+				for (i = 0, j = obj.children_d.length; i < j; i++) {
+					if (this.is_closed(this._model.data[obj.children_d[i]])) {
 						this._model.data[obj.children_d[i]].state.opened = true;
 					}
 				}
-				return this.trigger('open_all', { "node" : obj });
+				return this.trigger('open_all', { "node": obj });
 			}
 			original_obj = original_obj || dom;
 			_this = this;
@@ -2710,18 +2447,22 @@
 			dom.each(function () {
 				_this.open_node(
 					this,
-					function(node, status) { if(status && this.is_parent(node)) { this.open_all(node, animation, original_obj); } },
+					function (node, status) {
+						if (status && this.is_parent(node)) {
+							this.open_all(node, animation, original_obj);
+						}
+					},
 					animation || 0
 				);
 			});
-			if(original_obj.find('.jstree-closed').length === 0) {
+			if (original_obj.find('.jstree-closed').length === 0) {
 				/**
 				 * triggered when an `open_all` call completes
 				 * @event
 				 * @name open_all.jstree
 				 * @param {Object} node the opened node
 				 */
-				this.trigger('open_all', { "node" : this.get_node(original_obj) });
+				this.trigger('open_all', { "node": this.get_node(original_obj) });
 			}
 		},
 		/**
@@ -2731,26 +2472,33 @@
 		 * @param {Number} animation the animation duration in milliseconds when closing the nodes, the default is no animation
 		 * @trigger close_all.jstree
 		 */
-		close_all : function (obj, animation) {
-			if(!obj) { obj = $.jstree.root; }
+		close_all: function (obj, animation) {
+			if (!obj) {
+				obj = '#';
+			}
 			obj = this.get_node(obj);
-			if(!obj) { return false; }
-			var dom = obj.id === $.jstree.root ? this.get_container_ul() : this.get_node(obj, true),
+			if (!obj) {
+				return false;
+			}
+			var dom = obj.id === '#' ? this.get_container_ul() : this.get_node(obj, true),
 				_this = this, i, j;
-			if(dom.length) {
-				dom = this.is_open(obj) ? dom.find('.jstree-open').addBack() : dom.find('.jstree-open');
-				$(dom.get().reverse()).each(function () { _this.close_node(this, animation || 0); });
-			}
-			for(i = 0, j = obj.children_d.length; i < j; i++) {
-				this._model.data[obj.children_d[i]].state.opened = false;
+			if (!dom.length) {
+				for (i = 0, j = obj.children_d.length; i < j; i++) {
+					this._model.data[obj.children_d[i]].state.opened = false;
+				}
+				return this.trigger('close_all', { "node": obj });
 			}
+			dom = this.is_open(obj) ? dom.find('.jstree-open').addBack() : dom.find('.jstree-open');
+			$(dom.get().reverse()).each(function () {
+				_this.close_node(this, animation || 0);
+			});
 			/**
 			 * triggered when an `close_all` call completes
 			 * @event
 			 * @name close_all.jstree
 			 * @param {Object} node the closed node
 			 */
-			this.trigger('close_all', { "node" : obj });
+			this.trigger('close_all', { "node": obj });
 		},
 		/**
 		 * checks if a node is disabled (not selectable)
@@ -2758,7 +2506,7 @@
 		 * @param  {mixed} obj
 		 * @return {Boolean}
 		 */
-		is_disabled : function (obj) {
+		is_disabled: function (obj) {
 			obj = this.get_node(obj);
 			return obj && obj.state && obj.state.disabled;
 		},
@@ -2768,28 +2516,28 @@
 		 * @param {mixed} obj the node to enable
 		 * @trigger enable_node.jstree
 		 */
-		enable_node : function (obj) {
+		enable_node: function (obj) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.enable_node(obj[t1]);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			obj.state.disabled = false;
-			this.get_node(obj,true).children('.jstree-anchor').removeClass('jstree-disabled').attr('aria-disabled', false);
+			this.get_node(obj, true).children('.jstree-anchor').removeClass('jstree-disabled');
 			/**
 			 * triggered when an node is enabled
 			 * @event
 			 * @name enable_node.jstree
 			 * @param {Object} node the enabled node
 			 */
-			this.trigger('enable_node', { 'node' : obj });
+			this.trigger('enable_node', { 'node': obj });
 		},
 		/**
 		 * disables a node - so that it can not be selected
@@ -2797,148 +2545,28 @@
 		 * @param {mixed} obj the node to disable
 		 * @trigger disable_node.jstree
 		 */
-		disable_node : function (obj) {
+		disable_node: function (obj) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.disable_node(obj[t1]);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			obj.state.disabled = true;
-			this.get_node(obj,true).children('.jstree-anchor').addClass('jstree-disabled').attr('aria-disabled', true);
+			this.get_node(obj, true).children('.jstree-anchor').addClass('jstree-disabled');
 			/**
 			 * triggered when an node is disabled
 			 * @event
 			 * @name disable_node.jstree
 			 * @param {Object} node the disabled node
 			 */
-			this.trigger('disable_node', { 'node' : obj });
-		},
-		/**
-		 * hides a node - it is still in the structure but will not be visible
-		 * @name hide_node(obj)
-		 * @param {mixed} obj the node to hide
-		 * @param {Boolean} redraw internal parameter controlling if redraw is called
-		 * @trigger hide_node.jstree
-		 */
-		hide_node : function (obj, skip_redraw) {
-			var t1, t2;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.hide_node(obj[t1], true);
-				}
-				this.redraw();
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			if(!obj.state.hidden) {
-				obj.state.hidden = true;
-				this._node_changed(obj.parent);
-				if(!skip_redraw) {
-					this.redraw();
-				}
-				/**
-				 * triggered when an node is hidden
-				 * @event
-				 * @name hide_node.jstree
-				 * @param {Object} node the hidden node
-				 */
-				this.trigger('hide_node', { 'node' : obj });
-			}
-		},
-		/**
-		 * shows a node
-		 * @name show_node(obj)
-		 * @param {mixed} obj the node to show
-		 * @param {Boolean} skip_redraw internal parameter controlling if redraw is called
-		 * @trigger show_node.jstree
-		 */
-		show_node : function (obj, skip_redraw) {
-			var t1, t2;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.show_node(obj[t1], true);
-				}
-				this.redraw();
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			if(obj.state.hidden) {
-				obj.state.hidden = false;
-				this._node_changed(obj.parent);
-				if(!skip_redraw) {
-					this.redraw();
-				}
-				/**
-				 * triggered when an node is shown
-				 * @event
-				 * @name show_node.jstree
-				 * @param {Object} node the shown node
-				 */
-				this.trigger('show_node', { 'node' : obj });
-			}
-		},
-		/**
-		 * hides all nodes
-		 * @name hide_all()
-		 * @trigger hide_all.jstree
-		 */
-		hide_all : function (obj) {
-			var i, m = this._model.data, ids = [];
-			for(i in m) {
-				if(m.hasOwnProperty(i) && i !== $.jstree.root && !m[i].state.hidden) {
-					m[i].state.hidden = true;
-					ids.push(i);
-				}
-			}
-			this._model.force_full_redraw = true;
-			this.redraw();
-			/**
-			 * triggered when all nodes are hidden
-			 * @event
-			 * @name hide_all.jstree
-			 * @param {Array} nodes the IDs of all hidden nodes
-			 */
-			this.trigger('hide_all', { 'nodes' : ids });
-			return ids;
-		},
-		/**
-		 * shows all nodes
-		 * @name show_all()
-		 * @trigger show_all.jstree
-		 */
-		show_all : function (obj) {
-			var i, m = this._model.data, ids = [];
-			for(i in m) {
-				if(m.hasOwnProperty(i) && i !== $.jstree.root && m[i].state.hidden) {
-					m[i].state.hidden = false;
-					ids.push(i);
-				}
-			}
-			this._model.force_full_redraw = true;
-			this.redraw();
-			/**
-			 * triggered when all nodes are shown
-			 * @event
-			 * @name show_all.jstree
-			 * @param {Array} nodes the IDs of all shown nodes
-			 */
-			this.trigger('show_all', { 'nodes' : ids });
-			return ids;
+			this.trigger('disable_node', { 'node': obj });
 		},
 		/**
 		 * called when a node is selected by the user. Used internally.
@@ -2946,23 +2574,24 @@
 		 * @name activate_node(obj, e)
 		 * @param {mixed} obj the node
 		 * @param {Object} e the related event
-		 * @trigger activate_node.jstree, changed.jstree
+		 * @trigger activate_node.jstree
 		 */
-		activate_node : function (obj, e) {
-			if(this.is_disabled(obj)) {
+		activate_node: function (obj, e) {
+			if (this.is_disabled(obj)) {
 				return false;
 			}
-			if(!e || typeof e !== 'object') {
-				e = {};
-			}
 
 			// ensure last_clicked is still in the DOM, make it fresh (maybe it was moved?) and make sure it is still selected, if not - make last_clicked the last selected node
 			this._data.core.last_clicked = this._data.core.last_clicked && this._data.core.last_clicked.id !== undefined ? this.get_node(this._data.core.last_clicked.id) : null;
-			if(this._data.core.last_clicked && !this._data.core.last_clicked.state.selected) { this._data.core.last_clicked = null; }
-			if(!this._data.core.last_clicked && this._data.core.selected.length) { this._data.core.last_clicked = this.get_node(this._data.core.selected[this._data.core.selected.length - 1]); }
+			if (this._data.core.last_clicked && !this._data.core.last_clicked.state.selected) {
+				this._data.core.last_clicked = null;
+			}
+			if (!this._data.core.last_clicked && this._data.core.selected.length) {
+				this._data.core.last_clicked = this.get_node(this._data.core.selected[this._data.core.selected.length - 1]);
+			}
 
-			if(!this.settings.core.multiple || (!e.metaKey && !e.ctrlKey && !e.shiftKey) || (e.shiftKey && (!this._data.core.last_clicked || !this.get_parent(obj) || this.get_parent(obj) !== this._data.core.last_clicked.parent ) )) {
-				if(!this.settings.core.multiple && (e.metaKey || e.ctrlKey || e.shiftKey) && this.is_selected(obj)) {
+			if (!this.settings.core.multiple || (!e.metaKey && !e.ctrlKey && !e.shiftKey) || (e.shiftKey && (!this._data.core.last_clicked || !this.get_parent(obj) || this.get_parent(obj) !== this._data.core.last_clicked.parent ) )) {
+				if (!this.settings.core.multiple && (e.metaKey || e.ctrlKey || e.shiftKey) && this.is_selected(obj)) {
 					this.deselect_node(obj, false, e);
 				}
 				else {
@@ -2972,31 +2601,30 @@
 				}
 			}
 			else {
-				if(e.shiftKey) {
+				if (e.shiftKey) {
 					var o = this.get_node(obj).id,
 						l = this._data.core.last_clicked.id,
 						p = this.get_node(this._data.core.last_clicked.parent).children,
 						c = false,
 						i, j;
-					for(i = 0, j = p.length; i < j; i += 1) {
+					for (i = 0, j = p.length; i < j; i += 1) {
 						// separate IFs work whem o and l are the same
-						if(p[i] === o) {
+						if (p[i] === o) {
 							c = !c;
 						}
-						if(p[i] === l) {
+						if (p[i] === l) {
 							c = !c;
 						}
-						if(!this.is_disabled(p[i]) && (c || p[i] === o || p[i] === l)) {
-							this.select_node(p[i], true, false, e);
+						if (c || p[i] === o || p[i] === l) {
+							this.select_node(p[i], false, false, e);
 						}
 						else {
-							this.deselect_node(p[i], true, e);
+							this.deselect_node(p[i], false, e);
 						}
 					}
-					this.trigger('changed', { 'action' : 'select_node', 'node' : this.get_node(obj), 'selected' : this._data.core.selected, 'event' : e });
 				}
 				else {
-					if(!this.is_selected(obj)) {
+					if (!this.is_selected(obj)) {
 						this.select_node(obj, false, false, e);
 					}
 					else {
@@ -3009,9 +2637,8 @@
 			 * @event
 			 * @name activate_node.jstree
 			 * @param {Object} node
-			 * @param {Object} event the ooriginal event (if any) which triggered the call (may be an empty object)
 			 */
-			this.trigger('activate_node', { 'node' : this.get_node(obj), 'event' : e });
+			this.trigger('activate_node', { 'node': this.get_node(obj) });
 		},
 		/**
 		 * applies the hover state on a node, called when a node is hovered by the user. Used internally.
@@ -3020,13 +2647,15 @@
 		 * @param {mixed} obj
 		 * @trigger hover_node.jstree
 		 */
-		hover_node : function (obj) {
+		hover_node: function (obj) {
 			obj = this.get_node(obj, true);
-			if(!obj || !obj.length || obj.children('.jstree-hovered').length) {
+			if (!obj || !obj.length || obj.children('.jstree-hovered').length) {
 				return false;
 			}
 			var o = this.element.find('.jstree-hovered'), t = this.element;
-			if(o && o.length) { this.dehover_node(o); }
+			if (o && o.length) {
+				this.dehover_node(o);
+			}
 
 			obj.children('.jstree-anchor').addClass('jstree-hovered');
 			/**
@@ -3035,8 +2664,11 @@
 			 * @name hover_node.jstree
 			 * @param {Object} node
 			 */
-			this.trigger('hover_node', { 'node' : this.get_node(obj) });
-			setTimeout(function () { t.attr('aria-activedescendant', obj[0].id); }, 0);
+			this.trigger('hover_node', { 'node': this.get_node(obj) });
+			setTimeout(function () {
+				t.attr('aria-activedescendant', obj[0].id);
+				obj.attr('aria-selected', true);
+			}, 0);
 		},
 		/**
 		 * removes the hover state from a nodecalled when a node is no longer hovered by the user. Used internally.
@@ -3045,19 +2677,19 @@
 		 * @param {mixed} obj
 		 * @trigger dehover_node.jstree
 		 */
-		dehover_node : function (obj) {
+		dehover_node: function (obj) {
 			obj = this.get_node(obj, true);
-			if(!obj || !obj.length || !obj.children('.jstree-hovered').length) {
+			if (!obj || !obj.length || !obj.children('.jstree-hovered').length) {
 				return false;
 			}
-			obj.children('.jstree-anchor').removeClass('jstree-hovered');
+			obj.attr('aria-selected', false).children('.jstree-anchor').removeClass('jstree-hovered');
 			/**
 			 * triggered when an node is no longer hovered
 			 * @event
 			 * @name dehover_node.jstree
 			 * @param {Object} node
 			 */
-			this.trigger('dehover_node', { 'node' : this.get_node(obj) });
+			this.trigger('dehover_node', { 'node': this.get_node(obj) });
 		},
 		/**
 		 * select a node
@@ -3067,28 +2699,28 @@
 		 * @param {Boolean} prevent_open if set to `true` parents of the selected node won't be opened
 		 * @trigger select_node.jstree, changed.jstree
 		 */
-		select_node : function (obj, supress_event, prevent_open, e) {
+		select_node: function (obj, supress_event, prevent_open, e) {
 			var dom, t1, t2, th;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.select_node(obj[t1], supress_event, prevent_open, e);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			dom = this.get_node(obj, true);
-			if(!obj.state.selected) {
+			if (!obj.state.selected) {
 				obj.state.selected = true;
 				this._data.core.selected.push(obj.id);
-				if(!prevent_open) {
+				if (!prevent_open) {
 					dom = this._open_to(obj);
 				}
-				if(dom && dom.length) {
-					dom.attr('aria-selected', true).children('.jstree-anchor').addClass('jstree-clicked');
+				if (dom && dom.length) {
+					dom.children('.jstree-anchor').addClass('jstree-clicked');
 				}
 				/**
 				 * triggered when an node is selected
@@ -3098,8 +2730,8 @@
 				 * @param {Array} selected the current selection
 				 * @param {Object} event the event (if any) that triggered this select_node
 				 */
-				this.trigger('select_node', { 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
-				if(!supress_event) {
+				this.trigger('select_node', { 'node': obj, 'selected': this._data.core.selected, 'event': e });
+				if (!supress_event) {
 					/**
 					 * triggered when selection changes
 					 * @event
@@ -3109,7 +2741,7 @@
 					 * @param {Array} selected the current selection
 					 * @param {Object} event the event (if any) that triggered this changed event
 					 */
-					this.trigger('changed', { 'action' : 'select_node', 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
+					this.trigger('changed', { 'action': 'select_node', 'node': obj, 'selected': this._data.core.selected, 'event': e });
 				}
 			}
 		},
@@ -3120,25 +2752,25 @@
 		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
 		 * @trigger deselect_node.jstree, changed.jstree
 		 */
-		deselect_node : function (obj, supress_event, e) {
+		deselect_node: function (obj, supress_event, e) {
 			var t1, t2, dom;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.deselect_node(obj[t1], supress_event, e);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			dom = this.get_node(obj, true);
-			if(obj.state.selected) {
+			if (obj.state.selected) {
 				obj.state.selected = false;
 				this._data.core.selected = $.vakata.array_remove_item(this._data.core.selected, obj.id);
-				if(dom.length) {
-					dom.attr('aria-selected', false).children('.jstree-anchor').removeClass('jstree-clicked');
+				if (dom.length) {
+					dom.children('.jstree-anchor').removeClass('jstree-clicked');
 				}
 				/**
 				 * triggered when an node is deselected
@@ -3148,9 +2780,9 @@
 				 * @param {Array} selected the current selection
 				 * @param {Object} event the event (if any) that triggered this deselect_node
 				 */
-				this.trigger('deselect_node', { 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
-				if(!supress_event) {
-					this.trigger('changed', { 'action' : 'deselect_node', 'node' : obj, 'selected' : this._data.core.selected, 'event' : e });
+				this.trigger('deselect_node', { 'node': obj, 'selected': this._data.core.selected, 'event': e });
+				if (!supress_event) {
+					this.trigger('changed', { 'action': 'deselect_node', 'node': obj, 'selected': this._data.core.selected, 'event': e });
 				}
 			}
 		},
@@ -3160,11 +2792,11 @@
 		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
 		 * @trigger select_all.jstree, changed.jstree
 		 */
-		select_all : function (supress_event) {
+		select_all: function (supress_event) {
 			var tmp = this._data.core.selected.concat([]), i, j;
-			this._data.core.selected = this._model.data[$.jstree.root].children_d.concat();
-			for(i = 0, j = this._data.core.selected.length; i < j; i++) {
-				if(this._model.data[this._data.core.selected[i]]) {
+			this._data.core.selected = this._model.data['#'].children_d.concat();
+			for (i = 0, j = this._data.core.selected.length; i < j; i++) {
+				if (this._model.data[this._data.core.selected[i]]) {
 					this._model.data[this._data.core.selected[i]].state.selected = true;
 				}
 			}
@@ -3175,9 +2807,9 @@
 			 * @name select_all.jstree
 			 * @param {Array} selected the current selection
 			 */
-			this.trigger('select_all', { 'selected' : this._data.core.selected });
-			if(!supress_event) {
-				this.trigger('changed', { 'action' : 'select_all', 'selected' : this._data.core.selected, 'old_selection' : tmp });
+			this.trigger('select_all', { 'selected': this._data.core.selected });
+			if (!supress_event) {
+				this.trigger('changed', { 'action': 'select_all', 'selected': this._data.core.selected, 'old_selection': tmp });
 			}
 		},
 		/**
@@ -3186,15 +2818,15 @@
 		 * @param {Boolean} supress_event if set to `true` the `changed.jstree` event won't be triggered
 		 * @trigger deselect_all.jstree, changed.jstree
 		 */
-		deselect_all : function (supress_event) {
+		deselect_all: function (supress_event) {
 			var tmp = this._data.core.selected.concat([]), i, j;
-			for(i = 0, j = this._data.core.selected.length; i < j; i++) {
-				if(this._model.data[this._data.core.selected[i]]) {
+			for (i = 0, j = this._data.core.selected.length; i < j; i++) {
+				if (this._model.data[this._data.core.selected[i]]) {
 					this._model.data[this._data.core.selected[i]].state.selected = false;
 				}
 			}
 			this._data.core.selected = [];
-			this.element.find('.jstree-clicked').removeClass('jstree-clicked').parent().attr('aria-selected', false);
+			this.element.find('.jstree-clicked').removeClass('jstree-clicked');
 			/**
 			 * triggered when all nodes are deselected
 			 * @event
@@ -3202,9 +2834,9 @@
 			 * @param {Object} node the previous selection
 			 * @param {Array} selected the current selection
 			 */
-			this.trigger('deselect_all', { 'selected' : this._data.core.selected, 'node' : tmp });
-			if(!supress_event) {
-				this.trigger('changed', { 'action' : 'deselect_all', 'selected' : this._data.core.selected, 'old_selection' : tmp });
+			this.trigger('deselect_all', { 'selected': this._data.core.selected, 'node': tmp });
+			if (!supress_event) {
+				this.trigger('changed', { 'action': 'deselect_all', 'selected': this._data.core.selected, 'old_selection': tmp });
 			}
 		},
 		/**
@@ -3213,9 +2845,9 @@
 		 * @param  {mixed}  obj
 		 * @return {Boolean}
 		 */
-		is_selected : function (obj) {
+		is_selected: function (obj) {
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			return obj.state.selected;
@@ -3226,8 +2858,10 @@
 		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
 		 * @return {Array}
 		 */
-		get_selected : function (full) {
-			return full ? $.map(this._data.core.selected, $.proxy(function (i) { return this.get_node(i); }, this)) : this._data.core.selected.slice();
+		get_selected: function (full) {
+			return full ? $.map(this._data.core.selected, $.proxy(function (i) {
+				return this.get_node(i);
+			}, this)) : this._data.core.selected.slice();
 		},
 		/**
 		 * get an array of all top level selected nodes (ignoring children of selected nodes)
@@ -3235,26 +2869,28 @@
 		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
 		 * @return {Array}
 		 */
-		get_top_selected : function (full) {
+		get_top_selected: function (full) {
 			var tmp = this.get_selected(true),
 				obj = {}, i, j, k, l;
-			for(i = 0, j = tmp.length; i < j; i++) {
+			for (i = 0, j = tmp.length; i < j; i++) {
 				obj[tmp[i].id] = tmp[i];
 			}
-			for(i = 0, j = tmp.length; i < j; i++) {
-				for(k = 0, l = tmp[i].children_d.length; k < l; k++) {
-					if(obj[tmp[i].children_d[k]]) {
+			for (i = 0, j = tmp.length; i < j; i++) {
+				for (k = 0, l = tmp[i].children_d.length; k < l; k++) {
+					if (obj[tmp[i].children_d[k]]) {
 						delete obj[tmp[i].children_d[k]];
 					}
 				}
 			}
 			tmp = [];
-			for(i in obj) {
-				if(obj.hasOwnProperty(i)) {
+			for (i in obj) {
+				if (obj.hasOwnProperty(i)) {
 					tmp.push(i);
 				}
 			}
-			return full ? $.map(tmp, $.proxy(function (i) { return this.get_node(i); }, this)) : tmp;
+			return full ? $.map(tmp, $.proxy(function (i) {
+				return this.get_node(i);
+			}, this)) : tmp;
 		},
 		/**
 		 * get an array of all bottom level selected nodes (ignoring selected parents)
@@ -3262,15 +2898,17 @@
 		 * @param  {mixed}  full if set to `true` the returned array will consist of the full node objects, otherwise - only IDs will be returned
 		 * @return {Array}
 		 */
-		get_bottom_selected : function (full) {
+		get_bottom_selected: function (full) {
 			var tmp = this.get_selected(true),
 				obj = [], i, j;
-			for(i = 0, j = tmp.length; i < j; i++) {
-				if(!tmp[i].children.length) {
+			for (i = 0, j = tmp.length; i < j; i++) {
+				if (!tmp[i].children.length) {
 					obj.push(tmp[i].id);
 				}
 			}
-			return full ? $.map(obj, $.proxy(function (i) { return this.get_node(i); }, this)) : obj;
+			return full ? $.map(obj, $.proxy(function (i) {
+				return this.get_node(i);
+			}, this)) : obj;
 		},
 		/**
 		 * gets the current state of the tree so that it can be restored later with `set_state(state)`. Used internally.
@@ -3278,31 +2916,31 @@
 		 * @private
 		 * @return {Object}
 		 */
-		get_state : function () {
-			var state	= {
-				'core' : {
-					'open' : [],
-					'scroll' : {
-						'left' : this.element.scrollLeft(),
-						'top' : this.element.scrollTop()
+		get_state: function () {
+			var state = {
+				'core': {
+					'open': [],
+					'scroll': {
+						'left': this.element.scrollLeft(),
+						'top': this.element.scrollTop()
 					},
 					/*!
-					'themes' : {
-						'name' : this.get_theme(),
-						'icons' : this._data.core.themes.icons,
-						'dots' : this._data.core.themes.dots
-					},
-					*/
-					'selected' : []
+					 'themes' : {
+					 'name' : this.get_theme(),
+					 'icons' : this._data.core.themes.icons,
+					 'dots' : this._data.core.themes.dots
+					 },
+					 */
+					'selected': []
 				}
 			}, i;
-			for(i in this._model.data) {
-				if(this._model.data.hasOwnProperty(i)) {
-					if(i !== $.jstree.root) {
-						if(this._model.data[i].state.opened) {
+			for (i in this._model.data) {
+				if (this._model.data.hasOwnProperty(i)) {
+					if (i !== '#') {
+						if (this._model.data[i].state.opened) {
 							state.core.open.push(i);
 						}
-						if(this._model.data[i].state.selected) {
+						if (this._model.data[i].state.selected) {
 							state.core.selected.push(i);
 						}
 					}
@@ -3314,63 +2952,103 @@
 		 * sets the state of the tree. Used internally.
 		 * @name set_state(state [, callback])
 		 * @private
-		 * @param {Object} state the state to restore. Keep in mind this object is passed by reference and jstree will modify it.
+		 * @param {Object} state the state to restore
 		 * @param {Function} callback an optional function to execute once the state is restored.
 		 * @trigger set_state.jstree
 		 */
-		set_state : function (state, callback) {
-			if(state) {
-				if(state.core) {
-					var res, n, t, _this, i;
-					if(state.core.open) {
-						if(!$.isArray(state.core.open) || !state.core.open.length) {
+		set_state: function (state, callback) {
+			if (state) {
+				if (state.core) {
+					var res, n, t, _this;
+					if (state.core.open) {
+						if (!$.isArray(state.core.open)) {
+							delete state.core.open;
+							this.set_state(state, callback);
+							return false;
+						}
+						res = true;
+						n = false;
+						t = this;
+						$.each(state.core.open.concat([]), function (i, v) {
+							n = t.get_node(v);
+							if (n) {
+								if (t.is_loaded(v)) {
+									if (t.is_closed(v)) {
+										t.open_node(v, false, 0);
+									}
+									if (state && state.core && state.core.open) {
+										$.vakata.array_remove_item(state.core.open, v);
+									}
+								}
+								else {
+									if (!t.is_loading(v)) {
+										t.open_node(v, $.proxy(function (o, s) {
+											if (!s && state && state.core && state.core.open) {
+												$.vakata.array_remove_item(state.core.open, o.id);
+											}
+											this.set_state(state, callback);
+										}, t), 0);
+									}
+									// there will be some async activity - so wait for it
+									res = false;
+								}
+							}
+						});
+						if (res) {
 							delete state.core.open;
 							this.set_state(state, callback);
 						}
-						else {
-							this._load_nodes(state.core.open, function (nodes) {
-								this.open_node(nodes, false, 0);
-								delete state.core.open;
-								this.set_state(state, callback);
-							}, true);
-						}
 						return false;
 					}
-					if(state.core.scroll) {
-						if(state.core.scroll && state.core.scroll.left !== undefined) {
+					if (state.core.scroll) {
+						if (state.core.scroll && state.core.scroll.left !== undefined) {
 							this.element.scrollLeft(state.core.scroll.left);
 						}
-						if(state.core.scroll && state.core.scroll.top !== undefined) {
+						if (state.core.scroll && state.core.scroll.top !== undefined) {
 							this.element.scrollTop(state.core.scroll.top);
 						}
 						delete state.core.scroll;
 						this.set_state(state, callback);
 						return false;
 					}
-					if(state.core.selected) {
+					/*!
+					 if(state.core.themes) {
+					 if(state.core.themes.name) {
+					 this.set_theme(state.core.themes.name);
+					 }
+					 if(typeof state.core.themes.dots !== 'undefined') {
+					 this[ state.core.themes.dots ? "show_dots" : "hide_dots" ]();
+					 }
+					 if(typeof state.core.themes.icons !== 'undefined') {
+					 this[ state.core.themes.icons ? "show_icons" : "hide_icons" ]();
+					 }
+					 delete state.core.themes;
+					 delete state.core.open;
+					 this.set_state(state, callback);
+					 return false;
+					 }
+					 */
+					if (state.core.selected) {
 						_this = this;
 						this.deselect_all();
 						$.each(state.core.selected, function (i, v) {
-							_this.select_node(v, false, true);
+							_this.select_node(v);
 						});
 						delete state.core.selected;
 						this.set_state(state, callback);
 						return false;
 					}
-					for(i in state) {
-						if(state.hasOwnProperty(i) && i !== "core" && $.inArray(i, this.settings.plugins) === -1) {
-							delete state[i];
-						}
-					}
-					if($.isEmptyObject(state.core)) {
+					if ($.isEmptyObject(state.core)) {
 						delete state.core;
 						this.set_state(state, callback);
 						return false;
 					}
 				}
-				if($.isEmptyObject(state)) {
+				if ($.isEmptyObject(state)) {
 					state = null;
-					if(callback) { callback.call(this); }
+					if (callback) {
+						callback.call(this);
+					}
 					/**
 					 * triggered when a `set_state` call completes
 					 * @event
@@ -3390,34 +3068,29 @@
 		 * @param {Mixed} forget_state if set to `true` state will not be reapplied, if set to a function (receiving the current state as argument) the result of that function will be used as state
 		 * @trigger refresh.jstree
 		 */
-		refresh : function (skip_loading, forget_state) {
+		refresh: function (skip_loading, forget_state) {
 			this._data.core.state = forget_state === true ? {} : this.get_state();
-			if(forget_state && $.isFunction(forget_state)) { this._data.core.state = forget_state.call(this, this._data.core.state); }
-			this._cnt = 0;
-			this._model.data = {};
-			this._model.data[$.jstree.root] = {
-				id : $.jstree.root,
-				parent : null,
-				parents : [],
-				children : [],
-				children_d : [],
-				state : { loaded : false }
-			};
-			this._data.core.selected = [];
-			this._data.core.last_clicked = null;
-			this._data.core.focused = null;
-
-			var c = this.get_container_ul()[0].className;
-			if(!skip_loading) {
-				this.element.html("<"+"ul class='"+c+"' role='group'><"+"li class='jstree-initial-node jstree-loading jstree-leaf jstree-last' role='treeitem' id='j"+this._id+"_loading'><i class='jstree-icon jstree-ocl'></i><"+"a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
-				this.element.attr('aria-activedescendant','j'+this._id+'_loading');
+			if (forget_state && $.isFunction(forget_state)) {
+				this._data.core.state = forget_state.call(this, this._data.core.state);
 			}
-			this.load_node($.jstree.root, function (o, s) {
-				if(s) {
+			this._cnt = 0;
+			this._model.data = {
+				'#': {
+					id: '#',
+					parent: null,
+					parents: [],
+					children: [],
+					children_d: [],
+					state: { loaded: false }
+				}
+			};
+			var c = this.get_container_ul()[0].className;
+			if (!skip_loading) {
+				this.element.html("<" + "ul class='" + c + "'><" + "li class='jstree-initial-node jstree-loading jstree-leaf jstree-last'><i class='jstree-icon jstree-ocl'></i><" + "a class='jstree-anchor' href='#'><i class='jstree-icon jstree-themeicon-hidden'></i>" + this.get_string("Loading ...") + "</a></li></ul>");
+			}
+			this.load_node('#', function (o, s) {
+				if (s) {
 					this.get_container_ul()[0].className = c;
-					if(this._firstChild(this.get_container_ul()[0])) {
-						this.element.attr('aria-activedescendant',this._firstChild(this.get_container_ul()[0]).id);
-					}
 					this.set_state($.extend(true, {}, this._data.core.state), function () {
 						/**
 						 * triggered when a `refresh` call completes
@@ -3436,13 +3109,19 @@
 		 * @param  {mixed} obj the node
 		 * @trigger refresh_node.jstree
 		 */
-		refresh_node : function (obj) {
+		refresh_node: function (obj) {
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
+			if (!obj || obj.id === '#') {
+				return false;
+			}
 			var opened = [], to_load = [], s = this._data.core.selected.concat([]);
 			to_load.push(obj.id);
-			if(obj.state.opened === true) { opened.push(obj.id); }
-			this.get_node(obj, true).find('.jstree-open').each(function() { opened.push(this.id); });
+			if (obj.state.opened === true) {
+				opened.push(obj.id);
+			}
+			this.get_node(obj, true).find('.jstree-open').each(function () {
+				opened.push(this.id);
+			});
 			this._load_nodes(to_load, $.proxy(function (nodes) {
 				this.open_node(opened, false, 0);
 				this.select_node(this._data.core.selected);
@@ -3453,7 +3132,7 @@
 				 * @param {Object} node - the refreshed node
 				 * @param {Array} nodes - an array of the IDs of the nodes that were reloaded
 				 */
-				this.trigger('refresh_node', { 'node' : obj, 'nodes' : nodes });
+				this.trigger('refresh_node', { 'node': obj, 'nodes': nodes });
 			}, this));
 		},
 		/**
@@ -3463,36 +3142,36 @@
 		 * @param  {String} id the new ID
 		 * @return {Boolean}
 		 */
-		set_id : function (obj, id) {
+		set_id: function (obj, id) {
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
+			if (!obj || obj.id === '#') {
+				return false;
+			}
 			var i, j, m = this._model.data;
 			id = id.toString();
 			// update parents (replace current ID with new one in children and children_d)
 			m[obj.parent].children[$.inArray(obj.id, m[obj.parent].children)] = id;
-			for(i = 0, j = obj.parents.length; i < j; i++) {
+			for (i = 0, j = obj.parents.length; i < j; i++) {
 				m[obj.parents[i]].children_d[$.inArray(obj.id, m[obj.parents[i]].children_d)] = id;
 			}
 			// update children (replace current ID with new one in parent and parents)
-			for(i = 0, j = obj.children.length; i < j; i++) {
+			for (i = 0, j = obj.children.length; i < j; i++) {
 				m[obj.children[i]].parent = id;
 			}
-			for(i = 0, j = obj.children_d.length; i < j; i++) {
+			for (i = 0, j = obj.children_d.length; i < j; i++) {
 				m[obj.children_d[i]].parents[$.inArray(obj.id, m[obj.children_d[i]].parents)] = id;
 			}
 			i = $.inArray(obj.id, this._data.core.selected);
-			if(i !== -1) { this._data.core.selected[i] = id; }
+			if (i !== -1) {
+				this._data.core.selected[i] = id;
+			}
 			// update model and obj itself (obj.id, this._model.data[KEY])
 			i = this.get_node(obj.id, true);
-			if(i) {
-				i.attr('id', id).children('.jstree-anchor').attr('id', id + '_anchor').end().attr('aria-labelledby', id + '_anchor');
-				if(this.element.attr('aria-activedescendant') === obj.id) {
-					this.element.attr('aria-activedescendant', id);
-				}
+			if (i) {
+				i.attr('id', id);
 			}
 			delete m[obj.id];
 			obj.id = id;
-			obj.li_attr.id = id;
 			m[id] = obj;
 			return true;
 		},
@@ -3502,9 +3181,9 @@
 		 * @param  {mixed} obj the node
 		 * @return {String}
 		 */
-		get_text : function (obj) {
+		get_text: function (obj) {
 			obj = this.get_node(obj);
-			return (!obj || obj.id === $.jstree.root) ? false : obj.text;
+			return (!obj || obj.id === '#') ? false : obj.text;
 		},
 		/**
 		 * set the text value of a node. Used internally, please use `rename_node(obj, val)`.
@@ -3515,19 +3194,21 @@
 		 * @return {Boolean}
 		 * @trigger set_text.jstree
 		 */
-		set_text : function (obj, val) {
+		set_text: function (obj, val) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.set_text(obj[t1], val);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
+			if (!obj || obj.id === '#') {
+				return false;
+			}
 			obj.text = val;
-			if(this.get_node(obj, true).length) {
+			if (this.get_node(obj, true).length) {
 				this.redraw_node(obj.id);
 			}
 			/**
@@ -3537,7 +3218,7 @@
 			 * @param {Object} obj
 			 * @param {String} text the new value
 			 */
-			this.trigger('set_text',{ "obj" : obj, "text" : val });
+			this.trigger('set_text', { "obj": obj, "text": val });
 			return true;
 		},
 		/**
@@ -3552,48 +3233,49 @@
 		 * @param  {Boolean} options.flat return flat JSON instead of nested
 		 * @return {Object}
 		 */
-		get_json : function (obj, options, flat) {
-			obj = this.get_node(obj || $.jstree.root);
-			if(!obj) { return false; }
-			if(options && options.flat && !flat) { flat = []; }
+		get_json: function (obj, options, flat) {
+			obj = this.get_node(obj || '#');
+			if (!obj) {
+				return false;
+			}
+			if (options && options.flat && !flat) {
+				flat = [];
+			}
 			var tmp = {
-				'id' : obj.id,
-				'text' : obj.text,
-				'icon' : this.get_icon(obj),
-				'li_attr' : $.extend(true, {}, obj.li_attr),
-				'a_attr' : $.extend(true, {}, obj.a_attr),
-				'state' : {},
-				'data' : options && options.no_data ? false : $.extend(true, {}, obj.data)
+				'id': obj.id,
+				'text': obj.text,
+				'icon': this.get_icon(obj),
+				'li_attr': obj.li_attr,
+				'a_attr': obj.a_attr,
+				'state': {},
+				'data': options && options.no_data ? false : obj.data
 				//( this.get_node(obj, true).length ? this.get_node(obj, true).data() : obj.data ),
 			}, i, j;
-			if(options && options.flat) {
+			if (options && options.flat) {
 				tmp.parent = obj.parent;
 			}
 			else {
 				tmp.children = [];
 			}
-			if(!options || !options.no_state) {
-				for(i in obj.state) {
-					if(obj.state.hasOwnProperty(i)) {
+			if (!options || !options.no_state) {
+				for (i in obj.state) {
+					if (obj.state.hasOwnProperty(i)) {
 						tmp.state[i] = obj.state[i];
 					}
 				}
 			}
-			if(options && options.no_id) {
+			if (options && options.no_id) {
 				delete tmp.id;
-				if(tmp.li_attr && tmp.li_attr.id) {
+				if (tmp.li_attr && tmp.li_attr.id) {
 					delete tmp.li_attr.id;
 				}
-				if(tmp.a_attr && tmp.a_attr.id) {
-					delete tmp.a_attr.id;
-				}
 			}
-			if(options && options.flat && obj.id !== $.jstree.root) {
+			if (options && options.flat && obj.id !== '#') {
 				flat.push(tmp);
 			}
-			if(!options || !options.no_children) {
-				for(i = 0, j = obj.children.length; i < j; i++) {
-					if(options && options.flat) {
+			if (!options || !options.no_children) {
+				for (i = 0, j = obj.children.length; i < j; i++) {
+					if (options && options.flat) {
 						this.get_json(obj.children[i], options, flat);
 					}
 					else {
@@ -3601,7 +3283,7 @@
 					}
 				}
 			}
-			return options && options.flat ? flat : (obj.id === $.jstree.root ? tmp.children : tmp);
+			return options && options.flat ? flat : (obj.id === '#' ? tmp.children : tmp);
 		},
 		/**
 		 * create a new node (do not confuse with load_node)
@@ -3614,24 +3296,37 @@
 		 * @return {String}            the ID of the newly create node
 		 * @trigger model.jstree, create_node.jstree
 		 */
-		create_node : function (par, node, pos, callback, is_loaded) {
-			if(par === null) { par = $.jstree.root; }
+		create_node: function (par, node, pos, callback, is_loaded) {
+			if (par === null) {
+				par = "#";
+			}
 			par = this.get_node(par);
-			if(!par) { return false; }
+			if (!par) {
+				return false;
+			}
 			pos = pos === undefined ? "last" : pos;
-			if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
-				return this.load_node(par, function () { this.create_node(par, node, pos, callback, true); });
+			if (!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
+				return this.load_node(par, function () {
+					this.create_node(par, node, pos, callback, true);
+				});
+			}
+			if (!node) {
+				node = { "text": this.get_string('New node') };
+			}
+			if (node.text === undefined) {
+				node.text = this.get_string('New node');
 			}
-			if(!node) { node = { "text" : this.get_string('New node') }; }
-			if(typeof node === "string") { node = { "text" : node }; }
-			if(node.text === undefined) { node.text = this.get_string('New node'); }
 			var tmp, dpc, i, j;
 
-			if(par.id === $.jstree.root) {
-				if(pos === "before") { pos = "first"; }
-				if(pos === "after") { pos = "last"; }
+			if (par.id === '#') {
+				if (pos === "before") {
+					pos = "first";
+				}
+				if (pos === "after") {
+					pos = "last";
+				}
 			}
-			switch(pos) {
+			switch (pos) {
 				case "before":
 					tmp = this.get_node(par.parent);
 					pos = $.inArray(par.id, tmp.children);
@@ -3650,38 +3345,50 @@
 					pos = par.children.length;
 					break;
 				default:
-					if(!pos) { pos = 0; }
+					if (!pos) {
+						pos = 0;
+					}
 					break;
 			}
-			if(pos > par.children.length) { pos = par.children.length; }
-			if(!node.id) { node.id = true; }
-			if(!this.check("create_node", node, par, pos)) {
+			if (pos > par.children.length) {
+				pos = par.children.length;
+			}
+			if (!node.id) {
+				node.id = true;
+			}
+			if (!this.check("create_node", node, par, pos)) {
 				this.settings.core.error.call(this, this._data.core.last_error);
 				return false;
 			}
-			if(node.id === true) { delete node.id; }
+			if (node.id === true) {
+				delete node.id;
+			}
 			node = this._parse_model_from_json(node, par.id, par.parents.concat());
-			if(!node) { return false; }
+			if (!node) {
+				return false;
+			}
 			tmp = this.get_node(node);
 			dpc = [];
 			dpc.push(node);
 			dpc = dpc.concat(tmp.children_d);
-			this.trigger('model', { "nodes" : dpc, "parent" : par.id });
+			this.trigger('model', { "nodes": dpc, "parent": par.id });
 
 			par.children_d = par.children_d.concat(dpc);
-			for(i = 0, j = par.parents.length; i < j; i++) {
+			for (i = 0, j = par.parents.length; i < j; i++) {
 				this._model.data[par.parents[i]].children_d = this._model.data[par.parents[i]].children_d.concat(dpc);
 			}
 			node = tmp;
 			tmp = [];
-			for(i = 0, j = par.children.length; i < j; i++) {
-				tmp[i >= pos ? i+1 : i] = par.children[i];
+			for (i = 0, j = par.children.length; i < j; i++) {
+				tmp[i >= pos ? i + 1 : i] = par.children[i];
 			}
 			tmp[pos] = node.id;
 			par.children = tmp;
 
 			this.redraw_node(par, true);
-			if(callback) { callback.call(this, this.get_node(node)); }
+			if (callback) {
+				callback.call(this, this.get_node(node));
+			}
 			/**
 			 * triggered when a node is created
 			 * @event
@@ -3690,7 +3397,7 @@
 			 * @param {String} parent the parent's ID
 			 * @param {Number} position the position of the new node among the parent's children
 			 */
-			this.trigger('create_node', { "node" : this.get_node(node), "parent" : par.id, "position" : pos });
+			this.trigger('create_node', { "node": this.get_node(node), "parent": par.id, "position": pos });
 			return node.id;
 		},
 		/**
@@ -3701,26 +3408,24 @@
 		 * @return {Boolean}
 		 * @trigger rename_node.jstree
 		 */
-		rename_node : function (obj, val) {
-            alert("aaaa");
+		rename_node: function (obj, val) {
 			var t1, t2, old;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.rename_node(obj[t1], val);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
+			if (!obj || obj.id === '#') {
+				return false;
+			}
 			old = obj.text;
-            alert("bbb");
-			if(!this.check("rename_node", obj, this.get_parent(obj), val)) {
-                alert("mmm");
+			if (!this.check("rename_node", obj, this.get_parent(obj), val)) {
 				this.settings.core.error.call(this, this._data.core.last_error);
 				return false;
 			}
-            alert("ccc");
 			this.set_text(obj, val); // .apply(this, Array.prototype.slice.call(arguments))
 			/**
 			 * triggered when a node is renamed
@@ -3730,7 +3435,7 @@
 			 * @param {String} text the new value
 			 * @param {String} old the old value
 			 */
-			this.trigger('rename_node', { "node" : obj, "text" : val, "old" : old });
+			this.trigger('rename_node', { "node": obj, "text": val, "old": old });
 			return true;
 		},
 		/**
@@ -3740,40 +3445,42 @@
 		 * @return {Boolean}
 		 * @trigger delete_node.jstree, changed.jstree
 		 */
-		delete_node : function (obj) {
-			var t1, t2, par, pos, tmp, i, j, k, l, c, top, lft;
-			if($.isArray(obj)) {
+		delete_node: function (obj) {
+			var t1, t2, par, pos, tmp, i, j, k, l, c;
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.delete_node(obj[t1]);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
+			if (!obj || obj.id === '#') {
+				return false;
+			}
 			par = this.get_node(obj.parent);
 			pos = $.inArray(obj.id, par.children);
 			c = false;
-			if(!this.check("delete_node", obj, par, pos)) {
+			if (!this.check("delete_node", obj, par, pos)) {
 				this.settings.core.error.call(this, this._data.core.last_error);
 				return false;
 			}
-			if(pos !== -1) {
+			if (pos !== -1) {
 				par.children = $.vakata.array_remove(par.children, pos);
 			}
 			tmp = obj.children_d.concat([]);
 			tmp.push(obj.id);
-			for(k = 0, l = tmp.length; k < l; k++) {
-				for(i = 0, j = obj.parents.length; i < j; i++) {
+			for (k = 0, l = tmp.length; k < l; k++) {
+				for (i = 0, j = obj.parents.length; i < j; i++) {
 					pos = $.inArray(tmp[k], this._model.data[obj.parents[i]].children_d);
-					if(pos !== -1) {
+					if (pos !== -1) {
 						this._model.data[obj.parents[i]].children_d = $.vakata.array_remove(this._model.data[obj.parents[i]].children_d, pos);
 					}
 				}
-				if(this._model.data[tmp[k]].state.selected) {
+				if (this._model.data[tmp[k]].state.selected) {
 					c = true;
 					pos = $.inArray(tmp[k], this._data.core.selected);
-					if(pos !== -1) {
+					if (pos !== -1) {
 						this._data.core.selected = $.vakata.array_remove(this._data.core.selected, pos);
 					}
 				}
@@ -3785,26 +3492,13 @@
 			 * @param {Object} node
 			 * @param {String} parent the parent's ID
 			 */
-			this.trigger('delete_node', { "node" : obj, "parent" : par.id });
-			if(c) {
-				this.trigger('changed', { 'action' : 'delete_node', 'node' : obj, 'selected' : this._data.core.selected, 'parent' : par.id });
+			this.trigger('delete_node', { "node": obj, "parent": par.id });
+			if (c) {
+				this.trigger('changed', { 'action': 'delete_node', 'node': obj, 'selected': this._data.core.selected, 'parent': par.id });
 			}
-			for(k = 0, l = tmp.length; k < l; k++) {
+			for (k = 0, l = tmp.length; k < l; k++) {
 				delete this._model.data[tmp[k]];
 			}
-			if($.inArray(this._data.core.focused, tmp) !== -1) {
-				this._data.core.focused = null;
-				top = this.element[0].scrollTop;
-				lft = this.element[0].scrollLeft;
-				if(par.id === $.jstree.root) {
-					this.get_node(this._model.data[$.jstree.root].children[0], true).children('.jstree-anchor').focus();
-				}
-				else {
-					this.get_node(par, true).children('.jstree-anchor').focus();
-				}
-				this.element[0].scrollTop  = top;
-				this.element[0].scrollLeft = lft;
-			}
 			this.redraw_node(par, true);
 			return true;
 		},
@@ -3819,26 +3513,28 @@
 		 * @param  {mixed} more some various additional information, for example if a "move_node" operations is triggered by DND this will be the hovered node
 		 * @return {Boolean}
 		 */
-		check : function (chk, obj, par, pos, more) {
+		check: function (chk, obj, par, pos, more) {
 			obj = obj && obj.id ? obj : this.get_node(obj);
 			par = par && par.id ? par : this.get_node(par);
 			var tmp = chk.match(/^move_node|copy_node|create_node$/i) ? par : obj,
 				chc = this.settings.core.check_callback;
-			if(chk === "move_node" || chk === "copy_node") {
-				if((!more || !more.is_multi) && (obj.id === par.id || $.inArray(obj.id, par.children) === pos || $.inArray(par.id, obj.children_d) !== -1)) {
-					this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_01', 'reason' : 'Moving parent inside child', 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+			if (chk === "move_node" || chk === "copy_node") {
+				if ((!more || !more.is_multi) && (obj.id === par.id || $.inArray(obj.id, par.children) === pos || $.inArray(par.id, obj.children_d) !== -1)) {
+					this._data.core.last_error = { 'error': 'check', 'plugin': 'core', 'id': 'core_01', 'reason': 'Moving parent inside child', 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 					return false;
 				}
 			}
-			if(tmp && tmp.data) { tmp = tmp.data; }
-			if(tmp && tmp.functions && (tmp.functions[chk] === false || tmp.functions[chk] === true)) {
-				if(tmp.functions[chk] === false) {
-					this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_02', 'reason' : 'Node data prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+			if (tmp && tmp.data) {
+				tmp = tmp.data;
+			}
+			if (tmp && tmp.functions && (tmp.functions[chk] === false || tmp.functions[chk] === true)) {
+				if (tmp.functions[chk] === false) {
+					this._data.core.last_error = { 'error': 'check', 'plugin': 'core', 'id': 'core_02', 'reason': 'Node data prevents function: ' + chk, 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 				}
 				return tmp.functions[chk];
 			}
-			if(chc === false || ($.isFunction(chc) && chc.call(this, chk, obj, par, pos, more) === false) || (chc && chc[chk] === false)) {
-				this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_03', 'reason' : 'User config for core.check_callback prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+			if (chc === false || ($.isFunction(chc) && chc.call(this, chk, obj, par, pos, more) === false) || (chc && chc[chk] === false)) {
+				this._data.core.last_error = { 'error': 'check', 'plugin': 'core', 'id': 'core_03', 'reason': 'User config for core.check_callback prevents function: ' + chk, 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 				return false;
 			}
 			return true;
@@ -3848,7 +3544,7 @@
 		 * @name last_error()
 		 * @return {Object}
 		 */
-		last_error : function () {
+		last_error: function () {
 			return this._data.core.last_error;
 		},
 		/**
@@ -3858,63 +3554,60 @@
 		 * @param  {mixed} par the new parent
 		 * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
 		 * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
-		 * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
-		 * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
-		 * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
+		 * @param  {Boolean} internal parameter indicating if the parent node has been loaded
 		 * @trigger move_node.jstree
 		 */
-		move_node : function (obj, par, pos, callback, is_loaded, skip_redraw, origin) {
+		move_node: function (obj, par, pos, callback, is_loaded) {
 			var t1, t2, old_par, old_pos, new_par, old_ins, is_multi, dpc, tmp, i, j, k, l, p;
 
 			par = this.get_node(par);
 			pos = pos === undefined ? 0 : pos;
-			if(!par) { return false; }
-			if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
-				return this.load_node(par, function () { this.move_node(obj, par, pos, callback, true, false, origin); });
+			if (!par) {
+				return false;
+			}
+			if (!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
+				return this.load_node(par, function () {
+					this.move_node(obj, par, pos, callback, true);
+				});
 			}
 
-			if($.isArray(obj)) {
-				if(obj.length === 1) {
-					obj = obj[0];
-				}
-				else {
-					//obj = obj.slice();
-					for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-						if((tmp = this.move_node(obj[t1], par, pos, callback, is_loaded, false, origin))) {
-							par = tmp;
-							pos = "after";
-						}
-					}
-					this.redraw();
-					return true;
+			if ($.isArray(obj)) {
+				obj = obj.reverse().slice();
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.move_node(obj[t1], par, pos, callback, is_loaded);
 				}
+				return true;
 			}
 			obj = obj && obj.id ? obj : this.get_node(obj);
 
-			if(!obj || obj.id === $.jstree.root) { return false; }
-
-			old_par = (obj.parent || $.jstree.root).toString();
-			new_par = (!pos.toString().match(/^(before|after)$/) || par.id === $.jstree.root) ? par : this.get_node(par.parent);
-			old_ins = origin ? origin : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
-			is_multi = !old_ins || !old_ins._id || (this._id !== old_ins._id);
-			old_pos = old_ins && old_ins._id && old_par && old_ins._model.data[old_par] && old_ins._model.data[old_par].children ? $.inArray(obj.id, old_ins._model.data[old_par].children) : -1;
-			if(old_ins && old_ins._id) {
-				obj = old_ins._model.data[obj.id];
+			if (!obj || obj.id === '#') {
+				return false;
 			}
 
-			if(is_multi) {
-				if((tmp = this.copy_node(obj, par, pos, callback, is_loaded, false, origin))) {
-					if(old_ins) { old_ins.delete_node(obj); }
-					return tmp;
+			old_par = (obj.parent || '#').toString();
+			new_par = (!pos.toString().match(/^(before|after)$/) || par.id === '#') ? par : this.get_node(par.parent);
+			old_ins = obj.instance ? obj.instance : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
+			is_multi = !old_ins || !old_ins._id || (this._id !== old_ins._id);
+			old_pos = old_ins && old_ins._id && old_par && old_ins._model.data[old_par] && old_ins._model.data[old_par].children ? $.inArray(obj.id, old_ins._model.data[old_par].children) : -1;
+			if (is_multi) {
+				if (this.copy_node(obj, par, pos, callback, is_loaded)) {
+					if (old_ins) {
+						old_ins.delete_node(obj);
+					}
+					return true;
 				}
 				return false;
 			}
 			//var m = this._model.data;
-			if(par.id === $.jstree.root) {
-				if(pos === "before") { pos = "first"; }
-				if(pos === "after") { pos = "last"; }
+			if (new_par.id === '#') {
+				if (pos === "before") {
+					pos = "first";
+				}
+				if (pos === "after") {
+					pos = "last";
+				}
 			}
-			switch(pos) {
+			switch (pos) {
 				case "before":
 					pos = $.inArray(par.id, new_par.children);
 					break;
@@ -3929,39 +3622,45 @@
 					pos = new_par.children.length;
 					break;
 				default:
-					if(!pos) { pos = 0; }
+					if (!pos) {
+						pos = 0;
+					}
 					break;
 			}
-			if(pos > new_par.children.length) { pos = new_par.children.length; }
-			if(!this.check("move_node", obj, new_par, pos, { 'core' : true, 'origin' : origin, 'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id) })) {
+			if (pos > new_par.children.length) {
+				pos = new_par.children.length;
+			}
+			if (!this.check("move_node", obj, new_par, pos, { 'core': true, 'is_multi': (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign': (!old_ins || !old_ins._id) })) {
 				this.settings.core.error.call(this, this._data.core.last_error);
 				return false;
 			}
-			if(obj.parent === new_par.id) {
+			if (obj.parent === new_par.id) {
 				dpc = new_par.children.concat();
 				tmp = $.inArray(obj.id, dpc);
-				if(tmp !== -1) {
+				if (tmp !== -1) {
 					dpc = $.vakata.array_remove(dpc, tmp);
-					if(pos > tmp) { pos--; }
+					if (pos > tmp) {
+						pos--;
+					}
 				}
 				tmp = [];
-				for(i = 0, j = dpc.length; i < j; i++) {
-					tmp[i >= pos ? i+1 : i] = dpc[i];
+				for (i = 0, j = dpc.length; i < j; i++) {
+					tmp[i >= pos ? i + 1 : i] = dpc[i];
 				}
 				tmp[pos] = obj.id;
 				new_par.children = tmp;
 				this._node_changed(new_par.id);
-				this.redraw(new_par.id === $.jstree.root);
+				this.redraw(new_par.id === '#');
 			}
 			else {
 				// clean old parent and up
 				tmp = obj.children_d.concat();
 				tmp.push(obj.id);
-				for(i = 0, j = obj.parents.length; i < j; i++) {
+				for (i = 0, j = obj.parents.length; i < j; i++) {
 					dpc = [];
 					p = old_ins._model.data[obj.parents[i]].children_d;
-					for(k = 0, l = p.length; k < l; k++) {
-						if($.inArray(p[k], tmp) === -1) {
+					for (k = 0, l = p.length; k < l; k++) {
+						if ($.inArray(p[k], tmp) === -1) {
 							dpc.push(p[k]);
 						}
 					}
@@ -3970,12 +3669,12 @@
 				old_ins._model.data[old_par].children = $.vakata.array_remove_item(old_ins._model.data[old_par].children, obj.id);
 
 				// insert into new parent and up
-				for(i = 0, j = new_par.parents.length; i < j; i++) {
+				for (i = 0, j = new_par.parents.length; i < j; i++) {
 					this._model.data[new_par.parents[i]].children_d = this._model.data[new_par.parents[i]].children_d.concat(tmp);
 				}
 				dpc = [];
-				for(i = 0, j = new_par.children.length; i < j; i++) {
-					dpc[i >= pos ? i+1 : i] = new_par.children[i];
+				for (i = 0, j = new_par.children.length; i < j; i++) {
+					dpc[i >= pos ? i + 1 : i] = new_par.children[i];
 				}
 				dpc[pos] = obj.id;
 				new_par.children = dpc;
@@ -3991,23 +3690,18 @@
 
 				// update object children
 				tmp = tmp.concat();
-				for(i = 0, j = obj.children_d.length; i < j; i++) {
-					this._model.data[obj.children_d[i]].parents = this._model.data[obj.children_d[i]].parents.slice(0,p*-1);
+				for (i = 0, j = obj.children_d.length; i < j; i++) {
+					this._model.data[obj.children_d[i]].parents = this._model.data[obj.children_d[i]].parents.slice(0, p * -1);
 					Array.prototype.push.apply(this._model.data[obj.children_d[i]].parents, tmp);
 				}
 
-				if(old_par === $.jstree.root || new_par.id === $.jstree.root) {
-					this._model.force_full_redraw = true;
-				}
-				if(!this._model.force_full_redraw) {
-					this._node_changed(old_par);
-					this._node_changed(new_par.id);
-				}
-				if(!skip_redraw) {
-					this.redraw();
-				}
+				this._node_changed(old_par);
+				this._node_changed(new_par.id);
+				this.redraw(old_par === '#' || new_par.id === '#');
+			}
+			if (callback) {
+				callback.call(this, obj, new_par, pos);
 			}
-			if(callback) { callback.call(this, obj, new_par, pos); }
 			/**
 			 * triggered when a node is moved
 			 * @event
@@ -4021,8 +3715,8 @@
 			 * @param {jsTree} old_instance the instance the node came from
 			 * @param {jsTree} new_instance the instance of the new parent
 			 */
-			this.trigger('move_node', { "node" : obj, "parent" : new_par.id, "position" : pos, "old_parent" : old_par, "old_position" : old_pos, 'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id), 'old_instance' : old_ins, 'new_instance' : this });
-			return obj.id;
+			this.trigger('move_node', { "node": obj, "parent": new_par.id, "position": pos, "old_parent": old_par, "old_position": old_pos, 'is_multi': (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign': (!old_ins || !old_ins._id), 'old_instance': old_ins, 'new_instance': this });
+			return true;
 		},
 		/**
 		 * copy a node to a new parent
@@ -4031,54 +3725,48 @@
 		 * @param  {mixed} par the new parent
 		 * @param  {mixed} pos the position to insert at (besides integer values, "first" and "last" are supported, as well as "before" and "after"), defaults to integer `0`
 		 * @param  {function} callback a function to call once the move is completed, receives 3 arguments - the node, the new parent and the position
-		 * @param  {Boolean} is_loaded internal parameter indicating if the parent node has been loaded
-		 * @param  {Boolean} skip_redraw internal parameter indicating if the tree should be redrawn
-		 * @param  {Boolean} instance internal parameter indicating if the node comes from another instance
+		 * @param  {Boolean} internal parameter indicating if the parent node has been loaded
 		 * @trigger model.jstree copy_node.jstree
 		 */
-		copy_node : function (obj, par, pos, callback, is_loaded, skip_redraw, origin) {
+		copy_node: function (obj, par, pos, callback, is_loaded) {
 			var t1, t2, dpc, tmp, i, j, node, old_par, new_par, old_ins, is_multi;
 
 			par = this.get_node(par);
 			pos = pos === undefined ? 0 : pos;
-			if(!par) { return false; }
-			if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
-				return this.load_node(par, function () { this.copy_node(obj, par, pos, callback, true, false, origin); });
+			if (!par) {
+				return false;
+			}
+			if (!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
+				return this.load_node(par, function () {
+					this.copy_node(obj, par, pos, callback, true);
+				});
 			}
 
-			if($.isArray(obj)) {
-				if(obj.length === 1) {
-					obj = obj[0];
-				}
-				else {
-					//obj = obj.slice();
-					for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-						if((tmp = this.copy_node(obj[t1], par, pos, callback, is_loaded, true, origin))) {
-							par = tmp;
-							pos = "after";
-						}
-					}
-					this.redraw();
-					return true;
+			if ($.isArray(obj)) {
+				obj = obj.reverse().slice();
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+					this.copy_node(obj[t1], par, pos, callback, is_loaded);
 				}
+				return true;
 			}
 			obj = obj && obj.id ? obj : this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
+			if (!obj || obj.id === '#') {
+				return false;
+			}
 
-			old_par = (obj.parent || $.jstree.root).toString();
-			new_par = (!pos.toString().match(/^(before|after)$/) || par.id === $.jstree.root) ? par : this.get_node(par.parent);
-			old_ins = origin ? origin : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
+			old_par = (obj.parent || '#').toString();
+			new_par = (!pos.toString().match(/^(before|after)$/) || par.id === '#') ? par : this.get_node(par.parent);
+			old_ins = obj.instance ? obj.instance : (this._model.data[obj.id] ? this : $.jstree.reference(obj.id));
 			is_multi = !old_ins || !old_ins._id || (this._id !== old_ins._id);
-
-			if(old_ins && old_ins._id) {
-				obj = old_ins._model.data[obj.id];
+			if (new_par.id === '#') {
+				if (pos === "before") {
+					pos = "first";
+				}
+				if (pos === "after") {
+					pos = "last";
+				}
 			}
-
-			if(par.id === $.jstree.root) {
-				if(pos === "before") { pos = "first"; }
-				if(pos === "after") { pos = "last"; }
-			}
-			switch(pos) {
+			switch (pos) {
 				case "before":
 					pos = $.inArray(par.id, new_par.children);
 					break;
@@ -4093,49 +3781,56 @@
 					pos = new_par.children.length;
 					break;
 				default:
-					if(!pos) { pos = 0; }
+					if (!pos) {
+						pos = 0;
+					}
 					break;
 			}
-			if(pos > new_par.children.length) { pos = new_par.children.length; }
-			if(!this.check("copy_node", obj, new_par, pos, { 'core' : true, 'origin' : origin, 'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id) })) {
+			if (pos > new_par.children.length) {
+				pos = new_par.children.length;
+			}
+			if (!this.check("copy_node", obj, new_par, pos, { 'core': true, 'is_multi': (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign': (!old_ins || !old_ins._id) })) {
 				this.settings.core.error.call(this, this._data.core.last_error);
 				return false;
 			}
-			node = old_ins ? old_ins.get_json(obj, { no_id : true, no_data : true, no_state : true }) : obj;
-			if(!node) { return false; }
-			if(node.id === true) { delete node.id; }
+			node = old_ins ? old_ins.get_json(obj, { no_id: true, no_data: true, no_state: true }) : obj;
+			if (!node) {
+				return false;
+			}
+			if (node.id === true) {
+				delete node.id;
+			}
 			node = this._parse_model_from_json(node, new_par.id, new_par.parents.concat());
-			if(!node) { return false; }
+			if (!node) {
+				return false;
+			}
 			tmp = this.get_node(node);
-			if(obj && obj.state && obj.state.loaded === false) { tmp.state.loaded = false; }
+			if (obj && obj.state && obj.state.loaded === false) {
+				tmp.state.loaded = false;
+			}
 			dpc = [];
 			dpc.push(node);
 			dpc = dpc.concat(tmp.children_d);
-			this.trigger('model', { "nodes" : dpc, "parent" : new_par.id });
+			this.trigger('model', { "nodes": dpc, "parent": new_par.id });
 
 			// insert into new parent and up
-			for(i = 0, j = new_par.parents.length; i < j; i++) {
+			for (i = 0, j = new_par.parents.length; i < j; i++) {
 				this._model.data[new_par.parents[i]].children_d = this._model.data[new_par.parents[i]].children_d.concat(dpc);
 			}
 			dpc = [];
-			for(i = 0, j = new_par.children.length; i < j; i++) {
-				dpc[i >= pos ? i+1 : i] = new_par.children[i];
+			for (i = 0, j = new_par.children.length; i < j; i++) {
+				dpc[i >= pos ? i + 1 : i] = new_par.children[i];
 			}
 			dpc[pos] = tmp.id;
 			new_par.children = dpc;
 			new_par.children_d.push(tmp.id);
 			new_par.children_d = new_par.children_d.concat(tmp.children_d);
 
-			if(new_par.id === $.jstree.root) {
-				this._model.force_full_redraw = true;
+			this._node_changed(new_par.id);
+			this.redraw(new_par.id === '#');
+			if (callback) {
+				callback.call(this, tmp, new_par, pos);
 			}
-			if(!this._model.force_full_redraw) {
-				this._node_changed(new_par.id);
-			}
-			if(!skip_redraw) {
-				this.redraw(new_par.id === $.jstree.root);
-			}
-			if(callback) { callback.call(this, tmp, new_par, pos); }
 			/**
 			 * triggered when a node is copied
 			 * @event
@@ -4150,7 +3845,7 @@
 			 * @param {jsTree} old_instance the instance the node came from
 			 * @param {jsTree} new_instance the instance of the new parent
 			 */
-			this.trigger('copy_node', { "node" : tmp, "original" : obj, "parent" : new_par.id, "position" : pos, "old_parent" : old_par, "old_position" : old_ins && old_ins._id && old_par && old_ins._model.data[old_par] && old_ins._model.data[old_par].children ? $.inArray(obj.id, old_ins._model.data[old_par].children) : -1,'is_multi' : (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign' : (!old_ins || !old_ins._id), 'old_instance' : old_ins, 'new_instance' : this });
+			this.trigger('copy_node', { "node": tmp, "original": obj, "parent": new_par.id, "position": pos, "old_parent": old_par, "old_position": old_ins && old_ins._id && old_par && old_ins._model.data[old_par] && old_ins._model.data[old_par].children ? $.inArray(obj.id, old_ins._model.data[old_par].children) : -1, 'is_multi': (old_ins && old_ins._id && old_ins._id !== this._id), 'is_foreign': (!old_ins || !old_ins._id), 'old_instance': old_ins, 'new_instance': this });
 			return tmp.id;
 		},
 		/**
@@ -4159,16 +3854,26 @@
 		 * @param  {mixed} obj multiple objects can be passed using an array
 		 * @trigger cut.jstree
 		 */
-		cut : function (obj) {
-			if(!obj) { obj = this._data.core.selected.concat(); }
-			if(!$.isArray(obj)) { obj = [obj]; }
-			if(!obj.length) { return false; }
+		cut: function (obj) {
+			if (!obj) {
+				obj = this._data.core.selected.concat();
+			}
+			if (!$.isArray(obj)) {
+				obj = [obj];
+			}
+			if (!obj.length) {
+				return false;
+			}
 			var tmp = [], o, t1, t2;
-			for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+			for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 				o = this.get_node(obj[t1]);
-				if(o && o.id && o.id !== $.jstree.root) { tmp.push(o); }
+				if (o && o.id && o.id !== '#') {
+					tmp.push(o);
+				}
+			}
+			if (!tmp.length) {
+				return false;
 			}
-			if(!tmp.length) { return false; }
 			ccp_node = tmp;
 			ccp_inst = this;
 			ccp_mode = 'move_node';
@@ -4178,24 +3883,34 @@
 			 * @name cut.jstree
 			 * @param {Array} node
 			 */
-			this.trigger('cut', { "node" : obj });
+			this.trigger('cut', { "node": obj });
 		},
 		/**
 		 * copy a node (a later call to `paste(obj)` would copy the node)
 		 * @name copy(obj)
 		 * @param  {mixed} obj multiple objects can be passed using an array
-		 * @trigger copy.jstree
+		 * @trigger copy.jstre
 		 */
-		copy : function (obj) {
-			if(!obj) { obj = this._data.core.selected.concat(); }
-			if(!$.isArray(obj)) { obj = [obj]; }
-			if(!obj.length) { return false; }
+		copy: function (obj) {
+			if (!obj) {
+				obj = this._data.core.selected.concat();
+			}
+			if (!$.isArray(obj)) {
+				obj = [obj];
+			}
+			if (!obj.length) {
+				return false;
+			}
 			var tmp = [], o, t1, t2;
-			for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+			for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 				o = this.get_node(obj[t1]);
-				if(o && o.id && o.id !== $.jstree.root) { tmp.push(o); }
+				if (o && o.id && o.id !== '#') {
+					tmp.push(o);
+				}
+			}
+			if (!tmp.length) {
+				return false;
 			}
-			if(!tmp.length) { return false; }
 			ccp_node = tmp;
 			ccp_inst = this;
 			ccp_mode = 'copy_node';
@@ -4205,22 +3920,22 @@
 			 * @name copy.jstree
 			 * @param {Array} node
 			 */
-			this.trigger('copy', { "node" : obj });
+			this.trigger('copy', { "node": obj });
 		},
 		/**
 		 * get the current buffer (any nodes that are waiting for a paste operation)
 		 * @name get_buffer()
 		 * @return {Object} an object consisting of `mode` ("copy_node" or "move_node"), `node` (an array of objects) and `inst` (the instance)
 		 */
-		get_buffer : function () {
-			return { 'mode' : ccp_mode, 'node' : ccp_node, 'inst' : ccp_inst };
+		get_buffer: function () {
+			return { 'mode': ccp_mode, 'node': ccp_node, 'inst': ccp_inst };
 		},
 		/**
 		 * check if there is something in the buffer to paste
 		 * @name can_paste()
 		 * @return {Boolean}
 		 */
-		can_paste : function () {
+		can_paste: function () {
 			return ccp_mode !== false && ccp_node !== false; // && ccp_inst._model.data[ccp_node];
 		},
 		/**
@@ -4230,10 +3945,12 @@
 		 * @param  {mixed} pos the position to insert at (besides integer, "first" and "last" are supported), defaults to integer `0`
 		 * @trigger paste.jstree
 		 */
-		paste : function (obj, pos) {
+		paste: function (obj, pos) {
 			obj = this.get_node(obj);
-			if(!obj || !ccp_mode || !ccp_mode.match(/^(copy_node|move_node)$/) || !ccp_node) { return false; }
-			if(this[ccp_mode](ccp_node, obj, pos, false, false, false, ccp_inst)) {
+			if (!obj || !ccp_mode || !ccp_mode.match(/^(copy_node|move_node)$/) || !ccp_node) {
+				return false;
+			}
+			if (this[ccp_mode](ccp_node, obj, pos)) {
 				/**
 				 * triggered when paste is invoked
 				 * @event
@@ -4242,142 +3959,113 @@
 				 * @param {Array} node the nodes in the buffer
 				 * @param {String} mode the performed operation - "copy_node" or "move_node"
 				 */
-				this.trigger('paste', { "parent" : obj.id, "node" : ccp_node, "mode" : ccp_mode });
+				this.trigger('paste', { "parent": obj.id, "node": ccp_node, "mode": ccp_mode });
 			}
 			ccp_node = false;
 			ccp_mode = false;
 			ccp_inst = false;
 		},
-		/**
-		 * clear the buffer of previously copied or cut nodes
-		 * @name clear_buffer()
-		 * @trigger clear_buffer.jstree
-		 */
-		clear_buffer : function () {
-			ccp_node = false;
-			ccp_mode = false;
-			ccp_inst = false;
-			/**
-			 * triggered when the copy / cut buffer is cleared
-			 * @event
-			 * @name clear_buffer.jstree
-			 */
-			this.trigger('clear_buffer');
-		},
 		/**
 		 * put a node in edit mode (input field to rename the node)
-		 * @name edit(obj [, default_text, callback])
+		 * @name edit(obj [, default_text])
 		 * @param  {mixed} obj
-		 * @param  {String} default_text the text to populate the input with (if omitted or set to a non-string value the node's text value is used)
-		 * @param  {Function} callback a function to be called once the text box is blurred, it is called in the instance's scope and receives the node, a status parameter (true if the rename is successful, false otherwise) and a boolean indicating if the user cancelled the edit. You can access the node's title using .text
+		 * @param  {String} default_text the text to populate the input with (if omitted the node text value is used)
 		 */
-		edit : function (obj, default_text, callback) {
-			var rtl, w, a, s, t, h1, h2, fn, tmp, cancel = false;
+		edit: function (obj, default_text) {
 			obj = this.get_node(obj);
-			if(!obj) { return false; }
-			if(this.settings.core.check_callback === false) {
-				this._data.core.last_error = { 'error' : 'check', 'plugin' : 'core', 'id' : 'core_07', 'reason' : 'Could not edit node because of check_callback' };
+			if (!obj) {
+				return false;
+			}
+			if (this.settings.core.check_callback === false) {
+				this._data.core.last_error = { 'error': 'check', 'plugin': 'core', 'id': 'core_07', 'reason': 'Could not edit node because of check_callback' };
 				this.settings.core.error.call(this, this._data.core.last_error);
 				return false;
 			}
-			tmp = obj;
 			default_text = typeof default_text === 'string' ? default_text : obj.text;
 			this.set_text(obj, "");
 			obj = this._open_to(obj);
-			tmp.text = default_text;
 
-			rtl = this._data.core.rtl;
-			w  = this.element.width();
-			this._data.core.focused = tmp.id;
-			a  = obj.children('.jstree-anchor').focus();
-			s  = $('<span>');
+			var rtl = this._data.core.rtl,
+				w = this.element.width(),
+				a = obj.children('.jstree-anchor'),
+				s = $('<span>'),
 			/*!
-			oi = obj.children("i:visible"),
-			ai = a.children("i:visible"),
-			w1 = oi.width() * oi.length,
-			w2 = ai.width() * ai.length,
-			*/
-			t  = default_text;
-			h1 = $("<"+"div />", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo("body");
-			h2 = $("<"+"input />", {
-						"value" : t,
-						"class" : "jstree-rename-input",
-						// "size" : t.length,
-						"css" : {
-							"padding" : "0",
-							"border" : "1px solid silver",
-							"box-sizing" : "border-box",
-							"display" : "inline-block",
-							"height" : (this._data.core.li_height) + "px",
-							"lineHeight" : (this._data.core.li_height) + "px",
-							"width" : "150px" // will be set a bit further down
-						},
-						"blur" : $.proxy(function (e) {
-							e.stopImmediatePropagation();
-							e.preventDefault();
-							var i = s.children(".jstree-rename-input"),
-								v = i.val(),
-								f = this.settings.core.force_text,
-								nv;
-							if(v === "") { v = t; }
-							h1.remove();
-							s.replaceWith(a);
-							s.remove();
-							t = f ? t : $('<div></div>').append($.parseHTML(t)).html();
-							this.set_text(obj, t);
-							nv = !!this.rename_node(obj, f ? $('<div></div>').text(v).text() : $('<div></div>').append($.parseHTML(v)).html());
-							if(!nv) {
-								this.set_text(obj, t); // move this up? and fix #483
-							}
-							this._data.core.focused = tmp.id;
-							setTimeout($.proxy(function () {
-								var node = this.get_node(tmp.id, true);
-								if(node.length) {
-									this._data.core.focused = tmp.id;
-									node.children('.jstree-anchor').focus();
-								}
-							}, this), 0);
-							if(callback) {
-								callback.call(this, tmp, nv, cancel);
-							}
-						}, this),
-						"keydown" : function (e) {
-							var key = e.which;
-							if(key === 27) {
-								cancel = true;
-								this.value = t;
-							}
-							if(key === 27 || key === 13 || key === 37 || key === 38 || key === 39 || key === 40 || key === 32) {
-								e.stopImmediatePropagation();
-							}
-							if(key === 27 || key === 13) {
-								e.preventDefault();
-								this.blur();
-							}
-						},
-						"click" : function (e) { e.stopImmediatePropagation(); },
-						"mousedown" : function (e) { e.stopImmediatePropagation(); },
-						"keyup" : function (e) {
-							h2.width(Math.min(h1.text("pW" + this.value).width(),w));
-						},
-						"keypress" : function(e) {
-							if(e.which === 13) { return false; }
+			 oi = obj.children("i:visible"),
+			 ai = a.children("i:visible"),
+			 w1 = oi.width() * oi.length,
+			 w2 = ai.width() * ai.length,
+			 */
+				t = default_text,
+				h1 = $("<" + "div />", { css: { "position": "absolute", "top": "-200px", "left": (rtl ? "0px" : "-1000px"), "visibility": "hidden" } }).appendTo("body"),
+				h2 = $("<" + "input />", {
+					"value": t,
+					"class": "jstree-rename-input",
+					// "size" : t.length,
+					"css": {
+						"padding": "0",
+						"border": "1px solid silver",
+						"box-sizing": "border-box",
+						"display": "inline-block",
+						"height": (this._data.core.li_height) + "px",
+						"lineHeight": (this._data.core.li_height) + "px",
+						"width": "150px" // will be set a bit further down
+					},
+					"blur": $.proxy(function () {
+						var i = s.children(".jstree-rename-input"),
+							v = i.val();
+						if (v === "") {
+							v = t;
 						}
-					});
+						h1.remove();
+						s.replaceWith(a);
+						s.remove();
+						this.set_text(obj, t);
+						if (this.rename_node(obj, $('<div></div>').text(v)[this.settings.core.force_text ? 'text' : 'html']()) === false) {
+							this.set_text(obj, t); // move this up? and fix #483
+						}
+					}, this),
+					"keydown": function (event) {
+						var key = event.which;
+						if (key === 27) {
+							this.value = t;
+						}
+						if (key === 27 || key === 13 || key === 37 || key === 38 || key === 39 || key === 40 || key === 32) {
+							event.stopImmediatePropagation();
+						}
+						if (key === 27 || key === 13) {
+							event.preventDefault();
+							this.blur();
+						}
+					},
+					"click": function (e) {
+						e.stopImmediatePropagation();
+					},
+					"mousedown": function (e) {
+						e.stopImmediatePropagation();
+					},
+					"keyup": function (event) {
+						h2.width(Math.min(h1.text("pW" + this.value).width(), w));
+					},
+					"keypress": function (event) {
+						if (event.which === 13) {
+							return false;
+						}
+					}
+				}),
 				fn = {
-						fontFamily		: a.css('fontFamily')		|| '',
-						fontSize		: a.css('fontSize')			|| '',
-						fontWeight		: a.css('fontWeight')		|| '',
-						fontStyle		: a.css('fontStyle')		|| '',
-						fontStretch		: a.css('fontStretch')		|| '',
-						fontVariant		: a.css('fontVariant')		|| '',
-						letterSpacing	: a.css('letterSpacing')	|| '',
-						wordSpacing		: a.css('wordSpacing')		|| ''
+					fontFamily: a.css('fontFamily') || '',
+					fontSize: a.css('fontSize') || '',
+					fontWeight: a.css('fontWeight') || '',
+					fontStyle: a.css('fontStyle') || '',
+					fontStretch: a.css('fontStretch') || '',
+					fontVariant: a.css('fontVariant') || '',
+					letterSpacing: a.css('letterSpacing') || '',
+					wordSpacing: a.css('wordSpacing') || ''
 				};
 			s.attr('class', a.attr('class')).append(a.contents().clone()).append(h2);
 			a.replaceWith(s);
 			h1.css(fn);
-			h2.css(fn).width(Math.min(h1.text("pW" + h2[0].value).width(),w))[0].select();
+			h2.css(fn).width(Math.min(h1.text("pW" + h2[0].value).width(), w))[0].select();
 		},
 
 
@@ -4388,18 +4076,22 @@
 		 * @param {mixed} theme_url  the location of the CSS file for this theme. Omit or set to `false` if you manually included the file. Set to `true` to autoload from the `core.themes.dir` directory.
 		 * @trigger set_theme.jstree
 		 */
-		set_theme : function (theme_name, theme_url) {
-			if(!theme_name) { return false; }
-			if(theme_url === true) {
+		set_theme: function (theme_name, theme_url) {
+			if (!theme_name) {
+				return false;
+			}
+			if (theme_url === true) {
 				var dir = this.settings.core.themes.dir;
-				if(!dir) { dir = $.jstree.path + '/themes'; }
+				if (!dir) {
+					dir = $.jstree.path + '/themes';
+				}
 				theme_url = dir + '/' + theme_name + '/style.css';
 			}
-			if(theme_url && $.inArray(theme_url, themes_loaded) === -1) {
-				$('head').append('<'+'link rel="stylesheet" href="' + theme_url + '" type="text/css" />');
+			if (theme_url && $.inArray(theme_url, themes_loaded) === -1) {
+				$('head').append('<' + 'link rel="stylesheet" href="' + theme_url + '" type="text/css" />');
 				themes_loaded.push(theme_url);
 			}
-			if(this._data.core.themes.name) {
+			if (this._data.core.themes.name) {
 				this.element.removeClass('jstree-' + this._data.core.themes.name);
 			}
 			this._data.core.themes.name = theme_name;
@@ -4411,25 +4103,27 @@
 			 * @name set_theme.jstree
 			 * @param {String} theme the new theme
 			 */
-			this.trigger('set_theme', { 'theme' : theme_name });
+			this.trigger('set_theme', { 'theme': theme_name });
 		},
 		/**
 		 * gets the name of the currently applied theme name
 		 * @name get_theme()
 		 * @return {String}
 		 */
-		get_theme : function () { return this._data.core.themes.name; },
+		get_theme: function () {
+			return this._data.core.themes.name;
+		},
 		/**
 		 * changes the theme variant (if the theme has variants)
 		 * @name set_theme_variant(variant_name)
 		 * @param {String|Boolean} variant_name the variant to apply (if `false` is used the current variant is removed)
 		 */
-		set_theme_variant : function (variant_name) {
-			if(this._data.core.themes.variant) {
+		set_theme_variant: function (variant_name) {
+			if (this._data.core.themes.variant) {
 				this.element.removeClass('jstree-' + this._data.core.themes.name + '-' + this._data.core.themes.variant);
 			}
 			this._data.core.themes.variant = variant_name;
-			if(variant_name) {
+			if (variant_name) {
 				this.element.addClass('jstree-' + this._data.core.themes.name + '-' + this._data.core.themes.variant);
 			}
 		},
@@ -4438,88 +4132,125 @@
 		 * @name get_theme()
 		 * @return {String}
 		 */
-		get_theme_variant : function () { return this._data.core.themes.variant; },
+		get_theme_variant: function () {
+			return this._data.core.themes.variant;
+		},
 		/**
 		 * shows a striped background on the container (if the theme supports it)
 		 * @name show_stripes()
 		 */
-		show_stripes : function () { this._data.core.themes.stripes = true; this.get_container_ul().addClass("jstree-striped"); },
+		show_stripes: function () {
+			this._data.core.themes.stripes = true;
+			this.get_container_ul().addClass("jstree-striped");
+		},
 		/**
 		 * hides the striped background on the container
 		 * @name hide_stripes()
 		 */
-		hide_stripes : function () { this._data.core.themes.stripes = false; this.get_container_ul().removeClass("jstree-striped"); },
+		hide_stripes: function () {
+			this._data.core.themes.stripes = false;
+			this.get_container_ul().removeClass("jstree-striped");
+		},
 		/**
 		 * toggles the striped background on the container
 		 * @name toggle_stripes()
 		 */
-		toggle_stripes : function () { if(this._data.core.themes.stripes) { this.hide_stripes(); } else { this.show_stripes(); } },
+		toggle_stripes: function () {
+			if (this._data.core.themes.stripes) {
+				this.hide_stripes();
+			} else {
+				this.show_stripes();
+			}
+		},
 		/**
 		 * shows the connecting dots (if the theme supports it)
 		 * @name show_dots()
 		 */
-		show_dots : function () { this._data.core.themes.dots = true; this.get_container_ul().removeClass("jstree-no-dots"); },
+		show_dots: function () {
+			this._data.core.themes.dots = true;
+			this.get_container_ul().removeClass("jstree-no-dots");
+		},
 		/**
 		 * hides the connecting dots
 		 * @name hide_dots()
 		 */
-		hide_dots : function () { this._data.core.themes.dots = false; this.get_container_ul().addClass("jstree-no-dots"); },
+		hide_dots: function () {
+			this._data.core.themes.dots = false;
+			this.get_container_ul().addClass("jstree-no-dots");
+		},
 		/**
 		 * toggles the connecting dots
 		 * @name toggle_dots()
 		 */
-		toggle_dots : function () { if(this._data.core.themes.dots) { this.hide_dots(); } else { this.show_dots(); } },
+		toggle_dots: function () {
+			if (this._data.core.themes.dots) {
+				this.hide_dots();
+			} else {
+				this.show_dots();
+			}
+		},
 		/**
 		 * show the node icons
 		 * @name show_icons()
 		 */
-		show_icons : function () { this._data.core.themes.icons = true; this.get_container_ul().removeClass("jstree-no-icons"); },
+		show_icons: function () {
+			this._data.core.themes.icons = true;
+			this.get_container_ul().removeClass("jstree-no-icons");
+		},
 		/**
 		 * hide the node icons
 		 * @name hide_icons()
 		 */
-		hide_icons : function () { this._data.core.themes.icons = false; this.get_container_ul().addClass("jstree-no-icons"); },
+		hide_icons: function () {
+			this._data.core.themes.icons = false;
+			this.get_container_ul().addClass("jstree-no-icons");
+		},
 		/**
 		 * toggle the node icons
 		 * @name toggle_icons()
 		 */
-		toggle_icons : function () { if(this._data.core.themes.icons) { this.hide_icons(); } else { this.show_icons(); } },
+		toggle_icons: function () {
+			if (this._data.core.themes.icons) {
+				this.hide_icons();
+			} else {
+				this.show_icons();
+			}
+		},
 		/**
 		 * set the node icon for a node
 		 * @name set_icon(obj, icon)
 		 * @param {mixed} obj
 		 * @param {String} icon the new icon - can be a path to an icon or a className, if using an image that is in the current directory use a `./` prefix, otherwise it will be detected as a class
 		 */
-		set_icon : function (obj, icon) {
+		set_icon: function (obj, icon) {
 			var t1, t2, dom, old;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.set_icon(obj[t1], icon);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
+			if (!obj || obj.id === '#') {
+				return false;
+			}
 			old = obj.icon;
-			obj.icon = icon === true || icon === null || icon === undefined || icon === '' ? true : icon;
+			obj.icon = icon;
 			dom = this.get_node(obj, true).children(".jstree-anchor").children(".jstree-themeicon");
-			if(icon === false) {
+			if (icon === false) {
 				this.hide_icon(obj);
 			}
-			else if(icon === true || icon === null || icon === undefined || icon === '') {
-				dom.removeClass('jstree-themeicon-custom ' + old).css("background","").removeAttr("rel");
-				if(old === false) { this.show_icon(obj); }
+			else if (icon === true) {
+				dom.removeClass('jstree-themeicon-custom ' + old).css("background", "").removeAttr("rel");
 			}
-			else if(icon.indexOf("/") === -1 && icon.indexOf(".") === -1) {
-				dom.removeClass(old).css("background","");
-				dom.addClass(icon + ' jstree-themeicon-custom').attr("rel",icon);
-				if(old === false) { this.show_icon(obj); }
+			else if (icon.indexOf("/") === -1 && icon.indexOf(".") === -1) {
+				dom.removeClass(old).css("background", "");
+				dom.addClass(icon + ' jstree-themeicon-custom').attr("rel", icon);
 			}
 			else {
-				dom.removeClass(old).css("background","");
-				dom.addClass('jstree-themeicon-custom').css("background", "url('" + icon + "') center center no-repeat").attr("rel",icon);
-				if(old === false) { this.show_icon(obj); }
+				dom.removeClass(old).css("background", "");
+				dom.addClass('jstree-themeicon-custom').css("background", "url('" + icon + "') center center no-repeat").attr("rel", icon);
 			}
 			return true;
 		},
@@ -4529,26 +4260,28 @@
 		 * @param {mixed} obj
 		 * @return {String}
 		 */
-		get_icon : function (obj) {
+		get_icon: function (obj) {
 			obj = this.get_node(obj);
-			return (!obj || obj.id === $.jstree.root) ? false : obj.icon;
+			return (!obj || obj.id === '#') ? false : obj.icon;
 		},
 		/**
 		 * hide the icon on an individual node
 		 * @name hide_icon(obj)
 		 * @param {mixed} obj
 		 */
-		hide_icon : function (obj) {
+		hide_icon: function (obj) {
 			var t1, t2;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.hide_icon(obj[t1]);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj === $.jstree.root) { return false; }
+			if (!obj || obj === '#') {
+				return false;
+			}
 			obj.icon = false;
 			this.get_node(obj, true).children(".jstree-anchor").children(".jstree-themeicon").addClass('jstree-themeicon-hidden');
 			return true;
@@ -4558,20 +4291,24 @@
 		 * @name show_icon(obj)
 		 * @param {mixed} obj
 		 */
-		show_icon : function (obj) {
+		show_icon: function (obj) {
 			var t1, t2, dom;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.show_icon(obj[t1]);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj === $.jstree.root) { return false; }
+			if (!obj || obj === '#') {
+				return false;
+			}
 			dom = this.get_node(obj, true);
 			obj.icon = dom.length ? dom.children(".jstree-anchor").children(".jstree-themeicon").attr('rel') : true;
-			if(!obj.icon) { obj.icon = true; }
+			if (!obj.icon) {
+				obj.icon = true;
+			}
 			dom.children(".jstree-anchor").children(".jstree-themeicon").removeClass('jstree-themeicon-hidden');
 			return true;
 		}
@@ -4580,107 +4317,62 @@
 	// helpers
 	$.vakata = {};
 	// collect attributes
-	$.vakata.attributes = function(node, with_values) {
+	$.vakata.attributes = function (node, with_values) {
 		node = $(node)[0];
 		var attr = with_values ? {} : [];
-		if(node && node.attributes) {
+		if (node && node.attributes) {
 			$.each(node.attributes, function (i, v) {
-				if($.inArray(v.name.toLowerCase(),['style','contenteditable','hasfocus','tabindex']) !== -1) { return; }
-				if(v.value !== null && $.trim(v.value) !== '') {
-					if(with_values) { attr[v.name] = v.value; }
-					else { attr.push(v.name); }
+				if ($.inArray(v.nodeName.toLowerCase(), ['style', 'contenteditable', 'hasfocus', 'tabindex']) !== -1) {
+					return;
+				}
+				if (v.nodeValue !== null && $.trim(v.nodeValue) !== '') {
+					if (with_values) {
+						attr[v.nodeName] = v.nodeValue;
+					}
+					else {
+						attr.push(v.nodeName);
+					}
 				}
 			});
 		}
 		return attr;
 	};
-	$.vakata.array_unique = function(array) {
-		var a = [], i, j, l, o = {};
-		for(i = 0, l = array.length; i < l; i++) {
-			if(o[array[i]] === undefined) {
+	$.vakata.array_unique = function (array) {
+		var a = [], i, j, l;
+		for (i = 0, l = array.length; i < l; i++) {
+			for (j = 0; j <= i; j++) {
+				if (array[i] === array[j]) {
+					break;
+				}
+			}
+			if (j === i) {
 				a.push(array[i]);
-				o[array[i]] = true;
 			}
 		}
 		return a;
 	};
 	// remove item from array
-	$.vakata.array_remove = function(array, from, to) {
+	$.vakata.array_remove = function (array, from, to) {
 		var rest = array.slice((to || from) + 1 || array.length);
 		array.length = from < 0 ? array.length + from : from;
 		array.push.apply(array, rest);
 		return array;
 	};
 	// remove item from array
-	$.vakata.array_remove_item = function(array, item) {
+	$.vakata.array_remove_item = function (array, item) {
 		var tmp = $.inArray(item, array);
 		return tmp !== -1 ? $.vakata.array_remove(array, tmp) : array;
 	};
 
-
-/**
- * ### Changed plugin
- *
- * This plugin adds more information to the `changed.jstree` event. The new data is contained in the `changed` event data property, and contains a lists of `selected` and `deselected` nodes.
- */
-
-	$.jstree.plugins.changed = function (options, parent) {
-		var last = [];
-		this.trigger = function (ev, data) {
-			var i, j;
-			if(!data) {
-				data = {};
-			}
-			if(ev.replace('.jstree','') === 'changed') {
-				data.changed = { selected : [], deselected : [] };
-				var tmp = {};
-				for(i = 0, j = last.length; i < j; i++) {
-					tmp[last[i]] = 1;
-				}
-				for(i = 0, j = data.selected.length; i < j; i++) {
-					if(!tmp[data.selected[i]]) {
-						data.changed.selected.push(data.selected[i]);
-					}
-					else {
-						tmp[data.selected[i]] = 2;
-					}
-				}
-				for(i = 0, j = last.length; i < j; i++) {
-					if(tmp[last[i]] === 1) {
-						data.changed.deselected.push(last[i]);
-					}
-				}
-				last = data.selected.slice();
-			}
-			/**
-			 * triggered when selection changes (the "changed" plugin enhances the original event with more data)
-			 * @event
-			 * @name changed.jstree
-			 * @param {Object} node
-			 * @param {Object} action the action that caused the selection to change
-			 * @param {Array} selected the current selection
-			 * @param {Object} changed an object containing two properties `selected` and `deselected` - both arrays of node IDs, which were selected or deselected since the last changed event
-			 * @param {Object} event the event (if any) that triggered this changed event
-			 * @plugin changed
-			 */
-			parent.trigger.call(this, ev, data);
-		};
-		this.refresh = function (skip_loading, forget_state) {
-			last = [];
-			return parent.refresh.apply(this, arguments);
-		};
-	};
-
-/**
- * ### Checkbox plugin
- *
- * This plugin renders checkbox icons in front of each node, making multiple selection much easier.
- * It also supports tri-state behavior, meaning that if a node has a few of its children checked it will be rendered as undetermined, and state will be propagated up.
- */
+	/**
+	 * ### Checkbox plugin
+	 *
+	 * This plugin renders checkbox icons in front of each node, making multiple selection much easier.
+	 * It also supports tri-state behavior, meaning that if a node has a few of its children checked it will be rendered as undetermined, and state will be propagated up.
+	 */
 
 	var _i = document.createElement('I');
 	_i.className = 'jstree-icon jstree-checkbox';
-	_i.setAttribute('role', 'presentation');
 	/**
 	 * stores all defaults for the checkbox plugin
 	 * @name $.jstree.defaults.checkbox
@@ -4692,25 +4384,25 @@
 		 * @name $.jstree.defaults.checkbox.visible
 		 * @plugin checkbox
 		 */
-		visible				: true,
+		visible: true,
 		/**
 		 * a boolean indicating if checkboxes should cascade down and have an undetermined state. Defaults to `true`.
 		 * @name $.jstree.defaults.checkbox.three_state
 		 * @plugin checkbox
 		 */
-		three_state			: false,
+		three_state: true,
 		/**
 		 * a boolean indicating if clicking anywhere on the node should act as clicking on the checkbox. Defaults to `true`.
 		 * @name $.jstree.defaults.checkbox.whole_node
 		 * @plugin checkbox
 		 */
-		whole_node			: true,
+		whole_node: true,
 		/**
 		 * a boolean indicating if the selected style of a node should be kept, or removed. Defaults to `true`.
 		 * @name $.jstree.defaults.checkbox.keep_selected_style
 		 * @plugin checkbox
 		 */
-		keep_selected_style	: true,
+		keep_selected_style: true,
 		/**
 		 * This setting controls how cascading and undetermined nodes are applied.
 		 * If 'up' is in the string - cascading up is enabled, if 'down' is in the string - cascading down is enabled, if 'undetermined' is in the string - undetermined nodes will be used.
@@ -4718,274 +4410,110 @@
 		 * @name $.jstree.defaults.checkbox.cascade
 		 * @plugin checkbox
 		 */
-		cascade				: '',
+		cascade: '',
 		/**
 		 * This setting controls if checkbox are bound to the general tree selection or to an internal array maintained by the checkbox plugin. Defaults to `true`, only set to `false` if you know exactly what you are doing.
 		 * @name $.jstree.defaults.checkbox.tie_selection
 		 * @plugin checkbox
 		 */
-		tie_selection		: true
+		tie_selection: true
 	};
 	$.jstree.plugins.checkbox = function (options, parent) {
 		this.bind = function () {
 			parent.bind.call(this);
 			this._data.checkbox.uto = false;
 			this._data.checkbox.selected = [];
-			if(this.settings.checkbox.three_state) {
+			if (this.settings.checkbox.three_state) {
 				this.settings.checkbox.cascade = 'up+down+undetermined';
 			}
 			this.element
 				.on("init.jstree", $.proxy(function () {
-						this._data.checkbox.visible = this.settings.checkbox.visible;
-						if(!this.settings.checkbox.keep_selected_style) {
-							this.element.addClass('jstree-checkbox-no-clicked');
-						}
-						if(this.settings.checkbox.tie_selection) {
-							this.element.addClass('jstree-checkbox-selection');
-						}
-					}, this))
+					this._data.checkbox.visible = this.settings.checkbox.visible;
+					if (!this.settings.checkbox.keep_selected_style) {
+						this.element.addClass('jstree-checkbox-no-clicked');
+					}
+					if (this.settings.checkbox.tie_selection) {
+						this.element.addClass('jstree-checkbox-selection');
+					}
+				}, this))
 				.on("loading.jstree", $.proxy(function () {
-						this[ this._data.checkbox.visible ? 'show_checkboxes' : 'hide_checkboxes' ]();
-					}, this));
-			if(this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
+					this[ this._data.checkbox.visible ? 'show_checkboxes' : 'hide_checkboxes' ]();
+				}, this));
+			if (this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
 				this.element
 					.on('changed.jstree uncheck_node.jstree check_node.jstree uncheck_all.jstree check_all.jstree move_node.jstree copy_node.jstree redraw.jstree open_node.jstree', $.proxy(function () {
-							// only if undetermined is in setting
-							if(this._data.checkbox.uto) { clearTimeout(this._data.checkbox.uto); }
-							this._data.checkbox.uto = setTimeout($.proxy(this._undetermined, this), 50);
-						}, this));
+						// only if undetermined is in setting
+						if (this._data.checkbox.uto) {
+							clearTimeout(this._data.checkbox.uto);
+						}
+						this._data.checkbox.uto = setTimeout($.proxy(this._undetermined, this), 50);
+					}, this));
 			}
-			if(!this.settings.checkbox.tie_selection) {
+			if (!this.settings.checkbox.tie_selection) {
 				this.element
 					.on('model.jstree', $.proxy(function (e, data) {
 						var m = this._model.data,
 							p = m[data.parent],
 							dpc = data.nodes,
 							i, j;
-						for(i = 0, j = dpc.length; i < j; i++) {
-							m[dpc[i]].state.checked = m[dpc[i]].state.checked || (m[dpc[i]].original && m[dpc[i]].original.state && m[dpc[i]].original.state.checked);
-							if(m[dpc[i]].state.checked) {
+						for (i = 0, j = dpc.length; i < j; i++) {
+							m[dpc[i]].state.checked = (m[dpc[i]].original && m[dpc[i]].original.state && m[dpc[i]].original.state.checked);
+							if (m[dpc[i]].state.checked) {
 								this._data.checkbox.selected.push(dpc[i]);
 							}
 						}
 					}, this));
 			}
-			if(this.settings.checkbox.cascade.indexOf('up') !== -1 || this.settings.checkbox.cascade.indexOf('down') !== -1) {
+			if (this.settings.checkbox.cascade.indexOf('up') !== -1 || this.settings.checkbox.cascade.indexOf('down') !== -1) {
 				this.element
 					.on('model.jstree', $.proxy(function (e, data) {
-							var m = this._model.data,
-								p = m[data.parent],
-								dpc = data.nodes,
-								chd = [],
-								c, i, j, k, l, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
-
-							if(s.indexOf('down') !== -1) {
-								// apply down
-								if(p.state[ t ? 'selected' : 'checked' ]) {
-									for(i = 0, j = dpc.length; i < j; i++) {
-										m[dpc[i]].state[ t ? 'selected' : 'checked' ] = true;
-									}
-									this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(dpc);
-								}
-								else {
-									for(i = 0, j = dpc.length; i < j; i++) {
-										if(m[dpc[i]].state[ t ? 'selected' : 'checked' ]) {
-											for(k = 0, l = m[dpc[i]].children_d.length; k < l; k++) {
-												m[m[dpc[i]].children_d[k]].state[ t ? 'selected' : 'checked' ] = true;
-											}
-											this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(m[dpc[i]].children_d);
-										}
-									}
-								}
-							}
-
-							if(s.indexOf('up') !== -1) {
-								// apply up
-								for(i = 0, j = p.children_d.length; i < j; i++) {
-									if(!m[p.children_d[i]].children.length) {
-										chd.push(m[p.children_d[i]].parent);
-									}
-								}
-								chd = $.vakata.array_unique(chd);
-								for(k = 0, l = chd.length; k < l; k++) {
-									p = m[chd[k]];
-									while(p && p.id !== $.jstree.root) {
-										c = 0;
-										for(i = 0, j = p.children.length; i < j; i++) {
-											c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
-										}
-										if(c === j) {
-											p.state[ t ? 'selected' : 'checked' ] = true;
-											this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-											tmp = this.get_node(p, true);
-											if(tmp && tmp.length) {
-												tmp.attr('aria-selected', true).children('.jstree-anchor').addClass( t ? 'jstree-clicked' : 'jstree-checked');
-											}
-										}
-										else {
-											break;
-										}
-										p = this.get_node(p.parent);
-									}
-								}
-							}
-
-							this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected);
-						}, this))
-					.on(this.settings.checkbox.tie_selection ? 'select_node.jstree' : 'check_node.jstree', $.proxy(function (e, data) {
-							var obj = data.node,
-								m = this._model.data,
-								par = this.get_node(obj.parent),
-								dom = this.get_node(obj, true),
-								i, j, c, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
+						var m = this._model.data,
+							p = m[data.parent],
+							dpc = data.nodes,
+							chd = [],
+							c, i, j, k, l, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
 
+						if (s.indexOf('down') !== -1) {
 							// apply down
-							if(s.indexOf('down') !== -1) {
-								this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected.concat(obj.children_d));
-								for(i = 0, j = obj.children_d.length; i < j; i++) {
-									tmp = m[obj.children_d[i]];
-									tmp.state[ t ? 'selected' : 'checked' ] = true;
-									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-										tmp.original.state.undetermined = false;
-									}
+							if (p.state[ t ? 'selected' : 'checked' ]) {
+								for (i = 0, j = dpc.length; i < j; i++) {
+									m[dpc[i]].state[ t ? 'selected' : 'checked' ] = true;
 								}
+								this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(dpc);
 							}
-
-							// apply up
-							if(s.indexOf('up') !== -1) {
-								while(par && par.id !== $.jstree.root) {
-									c = 0;
-									for(i = 0, j = par.children.length; i < j; i++) {
-										c += m[par.children[i]].state[ t ? 'selected' : 'checked' ];
-									}
-									if(c === j) {
-										par.state[ t ? 'selected' : 'checked' ] = true;
-										this._data[ t ? 'core' : 'checkbox' ].selected.push(par.id);
-										tmp = this.get_node(par, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+							else {
+								for (i = 0, j = dpc.length; i < j; i++) {
+									if (m[dpc[i]].state[ t ? 'selected' : 'checked' ]) {
+										for (k = 0, l = m[dpc[i]].children_d.length; k < l; k++) {
+											m[m[dpc[i]].children_d[k]].state[ t ? 'selected' : 'checked' ] = true;
 										}
-									}
-									else {
-										break;
-									}
-									par = this.get_node(par.parent);
-								}
-							}
-
-							// apply down (process .children separately?)
-							if(s.indexOf('down') !== -1 && dom.length) {
-								dom.find('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked').parent().attr('aria-selected', true);
-							}
-						}, this))
-					.on(this.settings.checkbox.tie_selection ? 'deselect_all.jstree' : 'uncheck_all.jstree', $.proxy(function (e, data) {
-							var obj = this.get_node($.jstree.root),
-								m = this._model.data,
-								i, j, tmp;
-							for(i = 0, j = obj.children_d.length; i < j; i++) {
-								tmp = m[obj.children_d[i]];
-								if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-									tmp.original.state.undetermined = false;
-								}
-							}
-						}, this))
-					.on(this.settings.checkbox.tie_selection ? 'deselect_node.jstree' : 'uncheck_node.jstree', $.proxy(function (e, data) {
-							var obj = data.node,
-								dom = this.get_node(obj, true),
-								i, j, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
-							if(obj && obj.original && obj.original.state && obj.original.state.undetermined) {
-								obj.original.state.undetermined = false;
-							}
-
-							// apply down
-							if(s.indexOf('down') !== -1) {
-								for(i = 0, j = obj.children_d.length; i < j; i++) {
-									tmp = this._model.data[obj.children_d[i]];
-									tmp.state[ t ? 'selected' : 'checked' ] = false;
-									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-										tmp.original.state.undetermined = false;
+										this._data[ t ? 'core' : 'checkbox' ].selected = this._data[ t ? 'core' : 'checkbox' ].selected.concat(m[dpc[i]].children_d);
 									}
 								}
 							}
+						}
 
+						if (s.indexOf('up') !== -1) {
 							// apply up
-							if(s.indexOf('up') !== -1) {
-								for(i = 0, j = obj.parents.length; i < j; i++) {
-									tmp = this._model.data[obj.parents[i]];
-									tmp.state[ t ? 'selected' : 'checked' ] = false;
-									if(tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
-										tmp.original.state.undetermined = false;
-									}
-									tmp = this.get_node(obj.parents[i], true);
-									if(tmp && tmp.length) {
-										tmp.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
-									}
+							for (i = 0, j = p.children_d.length; i < j; i++) {
+								if (!m[p.children_d[i]].children.length) {
+									chd.push(m[p.children_d[i]].parent);
 								}
 							}
-							tmp = [];
-							for(i = 0, j = this._data[ t ? 'core' : 'checkbox' ].selected.length; i < j; i++) {
-								// apply down + apply up
-								if(
-									(s.indexOf('down') === -1 || $.inArray(this._data[ t ? 'core' : 'checkbox' ].selected[i], obj.children_d) === -1) &&
-									(s.indexOf('up') === -1 || $.inArray(this._data[ t ? 'core' : 'checkbox' ].selected[i], obj.parents) === -1)
-								) {
-									tmp.push(this._data[ t ? 'core' : 'checkbox' ].selected[i]);
-								}
-							}
-							this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(tmp);
-
-							// apply down (process .children separately?)
-							if(s.indexOf('down') !== -1 && dom.length) {
-								dom.find('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked').parent().attr('aria-selected', false);
-							}
-						}, this));
-			}
-			if(this.settings.checkbox.cascade.indexOf('up') !== -1) {
-				this.element
-					.on('delete_node.jstree', $.proxy(function (e, data) {
-							// apply up (whole handler)
-							var p = this.get_node(data.parent),
-								m = this._model.data,
-								i, j, c, tmp, t = this.settings.checkbox.tie_selection;
-							while(p && p.id !== $.jstree.root) {
-								c = 0;
-								for(i = 0, j = p.children.length; i < j; i++) {
-									c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
-								}
-								if(c === j) {
-									p.state[ t ? 'selected' : 'checked' ] = true;
-									this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-									tmp = this.get_node(p, true);
-									if(tmp && tmp.length) {
-										tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
-									}
-								}
-								else {
-									break;
-								}
-								p = this.get_node(p.parent);
-							}
-						}, this))
-					.on('move_node.jstree', $.proxy(function (e, data) {
-							// apply up (whole handler)
-							var is_multi = data.is_multi,
-								old_par = data.old_parent,
-								new_par = this.get_node(data.parent),
-								m = this._model.data,
-								p, c, i, j, tmp, t = this.settings.checkbox.tie_selection;
-							if(!is_multi) {
-								p = this.get_node(old_par);
-								while(p && p.id !== $.jstree.root) {
+							chd = $.vakata.array_unique(chd);
+							for (k = 0, l = chd.length; k < l; k++) {
+								p = m[chd[k]];
+								while (p && p.id !== '#') {
 									c = 0;
-									for(i = 0, j = p.children.length; i < j; i++) {
+									for (i = 0, j = p.children.length; i < j; i++) {
 										c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
 									}
-									if(c === j) {
+									if (c === j) {
 										p.state[ t ? 'selected' : 'checked' ] = true;
 										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
 										tmp = this.get_node(p, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+										if (tmp && tmp.length) {
+											tmp.children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
 										}
 									}
 									else {
@@ -4994,38 +4522,204 @@
 									p = this.get_node(p.parent);
 								}
 							}
-							p = new_par;
-							while(p && p.id !== $.jstree.root) {
-								c = 0;
-								for(i = 0, j = p.children.length; i < j; i++) {
-									c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+						}
+
+						this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected);
+					}, this))
+					.on(this.settings.checkbox.tie_selection ? 'select_node.jstree' : 'check_node.jstree', $.proxy(function (e, data) {
+						var obj = data.node,
+							m = this._model.data,
+							par = this.get_node(obj.parent),
+							dom = this.get_node(obj, true),
+							i, j, c, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
+
+						// apply down
+						if (s.indexOf('down') !== -1) {
+							this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(this._data[ t ? 'core' : 'checkbox' ].selected.concat(obj.children_d));
+							for (i = 0, j = obj.children_d.length; i < j; i++) {
+								tmp = m[obj.children_d[i]];
+								tmp.state[ t ? 'selected' : 'checked' ] = true;
+								if (tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+									tmp.original.state.undetermined = false;
 								}
-								if(c === j) {
-									if(!p.state[ t ? 'selected' : 'checked' ]) {
-										p.state[ t ? 'selected' : 'checked' ] = true;
-										this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
-										tmp = this.get_node(p, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', true).children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
-										}
+							}
+						}
+
+						// apply up
+						if (s.indexOf('up') !== -1) {
+							while (par && par.id !== '#') {
+								c = 0;
+								for (i = 0, j = par.children.length; i < j; i++) {
+									c += m[par.children[i]].state[ t ? 'selected' : 'checked' ];
+								}
+								if (c === j) {
+									par.state[ t ? 'selected' : 'checked' ] = true;
+									this._data[ t ? 'core' : 'checkbox' ].selected.push(par.id);
+									tmp = this.get_node(par, true);
+									if (tmp && tmp.length) {
+										tmp.children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
 									}
 								}
 								else {
-									if(p.state[ t ? 'selected' : 'checked' ]) {
-										p.state[ t ? 'selected' : 'checked' ] = false;
-										this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_remove_item(this._data[ t ? 'core' : 'checkbox' ].selected, p.id);
-										tmp = this.get_node(p, true);
-										if(tmp && tmp.length) {
-											tmp.attr('aria-selected', false).children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
-										}
-									}
-									else {
-										break;
+									break;
+								}
+								par = this.get_node(par.parent);
+							}
+						}
+
+						// apply down (process .children separately?)
+						if (s.indexOf('down') !== -1 && dom.length) {
+							dom.find('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+						}
+					}, this))
+					.on(this.settings.checkbox.tie_selection ? 'deselect_all.jstree' : 'uncheck_all.jstree', $.proxy(function (e, data) {
+						var obj = this.get_node('#'),
+							m = this._model.data,
+							i, j, tmp;
+						for (i = 0, j = obj.children_d.length; i < j; i++) {
+							tmp = m[obj.children_d[i]];
+							if (tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+								tmp.original.state.undetermined = false;
+							}
+						}
+					}, this))
+					.on(this.settings.checkbox.tie_selection ? 'deselect_node.jstree' : 'uncheck_node.jstree', $.proxy(function (e, data) {
+						var obj = data.node,
+							dom = this.get_node(obj, true),
+							i, j, tmp, s = this.settings.checkbox.cascade, t = this.settings.checkbox.tie_selection;
+						if (obj && obj.original && obj.original.state && obj.original.state.undetermined) {
+							obj.original.state.undetermined = false;
+						}
+
+						// apply down
+						if (s.indexOf('down') !== -1) {
+							for (i = 0, j = obj.children_d.length; i < j; i++) {
+								tmp = this._model.data[obj.children_d[i]];
+								tmp.state[ t ? 'selected' : 'checked' ] = false;
+								if (tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+									tmp.original.state.undetermined = false;
+								}
+							}
+						}
+
+						// apply up
+						if (s.indexOf('up') !== -1) {
+							for (i = 0, j = obj.parents.length; i < j; i++) {
+								tmp = this._model.data[obj.parents[i]];
+								tmp.state[ t ? 'selected' : 'checked' ] = false;
+								if (tmp && tmp.original && tmp.original.state && tmp.original.state.undetermined) {
+									tmp.original.state.undetermined = false;
+								}
+								tmp = this.get_node(obj.parents[i], true);
+								if (tmp && tmp.length) {
+									tmp.children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
+								}
+							}
+						}
+						tmp = [];
+						for (i = 0, j = this._data[ t ? 'core' : 'checkbox' ].selected.length; i < j; i++) {
+							// apply down + apply up
+							if (
+								(s.indexOf('down') === -1 || $.inArray(this._data[ t ? 'core' : 'checkbox' ].selected[i], obj.children_d) === -1) &&
+								(s.indexOf('up') === -1 || $.inArray(this._data[ t ? 'core' : 'checkbox' ].selected[i], obj.parents) === -1)
+							) {
+								tmp.push(this._data[ t ? 'core' : 'checkbox' ].selected[i]);
+							}
+						}
+						this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_unique(tmp);
+
+						// apply down (process .children separately?)
+						if (s.indexOf('down') !== -1 && dom.length) {
+							dom.find('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
+						}
+					}, this));
+			}
+			if (this.settings.checkbox.cascade.indexOf('up') !== -1) {
+				this.element
+					.on('delete_node.jstree', $.proxy(function (e, data) {
+						// apply up (whole handler)
+						var p = this.get_node(data.parent),
+							m = this._model.data,
+							i, j, c, tmp, t = this.settings.checkbox.tie_selection;
+						while (p && p.id !== '#') {
+							c = 0;
+							for (i = 0, j = p.children.length; i < j; i++) {
+								c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+							}
+							if (c === j) {
+								p.state[ t ? 'selected' : 'checked' ] = true;
+								this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+								tmp = this.get_node(p, true);
+								if (tmp && tmp.length) {
+									tmp.children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+								}
+							}
+							else {
+								break;
+							}
+							p = this.get_node(p.parent);
+						}
+					}, this))
+					.on('move_node.jstree', $.proxy(function (e, data) {
+						// apply up (whole handler)
+						var is_multi = data.is_multi,
+							old_par = data.old_parent,
+							new_par = this.get_node(data.parent),
+							m = this._model.data,
+							p, c, i, j, tmp, t = this.settings.checkbox.tie_selection;
+						if (!is_multi) {
+							p = this.get_node(old_par);
+							while (p && p.id !== '#') {
+								c = 0;
+								for (i = 0, j = p.children.length; i < j; i++) {
+									c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+								}
+								if (c === j) {
+									p.state[ t ? 'selected' : 'checked' ] = true;
+									this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+									tmp = this.get_node(p, true);
+									if (tmp && tmp.length) {
+										tmp.children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
 									}
 								}
+								else {
+									break;
+								}
 								p = this.get_node(p.parent);
 							}
-						}, this));
+						}
+						p = new_par;
+						while (p && p.id !== '#') {
+							c = 0;
+							for (i = 0, j = p.children.length; i < j; i++) {
+								c += m[p.children[i]].state[ t ? 'selected' : 'checked' ];
+							}
+							if (c === j) {
+								if (!p.state[ t ? 'selected' : 'checked' ]) {
+									p.state[ t ? 'selected' : 'checked' ] = true;
+									this._data[ t ? 'core' : 'checkbox' ].selected.push(p.id);
+									tmp = this.get_node(p, true);
+									if (tmp && tmp.length) {
+										tmp.children('.jstree-anchor').addClass(t ? 'jstree-clicked' : 'jstree-checked');
+									}
+								}
+							}
+							else {
+								if (p.state[ t ? 'selected' : 'checked' ]) {
+									p.state[ t ? 'selected' : 'checked' ] = false;
+									this._data[ t ? 'core' : 'checkbox' ].selected = $.vakata.array_remove_item(this._data[ t ? 'core' : 'checkbox' ].selected, p.id);
+									tmp = this.get_node(p, true);
+									if (tmp && tmp.length) {
+										tmp.children('.jstree-anchor').removeClass(t ? 'jstree-clicked' : 'jstree-checked');
+									}
+								}
+								else {
+									break;
+								}
+							}
+							p = this.get_node(p.parent);
+						}
+					}, this));
 			}
 		};
 		/**
@@ -5035,84 +4729,66 @@
 		 * @plugin checkbox
 		 */
 		this._undetermined = function () {
-			if(this.element === null) { return; }
-			var i, j, k, l, o = {}, m = this._model.data, t = this.settings.checkbox.tie_selection, s = this._data[ t ? 'core' : 'checkbox' ].selected, p = [], tt = this;
-			for(i = 0, j = s.length; i < j; i++) {
-				if(m[s[i]] && m[s[i]].parents) {
-					for(k = 0, l = m[s[i]].parents.length; k < l; k++) {
-						if(o[m[s[i]].parents[k]] === undefined && m[s[i]].parents[k] !== $.jstree.root) {
-							o[m[s[i]].parents[k]] = true;
-							p.push(m[s[i]].parents[k]);
-						}
-					}
+			var i, j, m = this._model.data, t = this.settings.checkbox.tie_selection, s = this._data[ t ? 'core' : 'checkbox' ].selected, p = [], tt = this;
+			for (i = 0, j = s.length; i < j; i++) {
+				if (m[s[i]] && m[s[i]].parents) {
+					p = p.concat(m[s[i]].parents);
 				}
 			}
 			// attempt for server side undetermined state
 			this.element.find('.jstree-closed').not(':has(.jstree-children)')
 				.each(function () {
 					var tmp = tt.get_node(this), tmp2;
-					if(!tmp.state.loaded) {
-						if(tmp.original && tmp.original.state && tmp.original.state.undetermined && tmp.original.state.undetermined === true) {
-							if(o[tmp.id] === undefined && tmp.id !== $.jstree.root) {
-								o[tmp.id] = true;
-								p.push(tmp.id);
-							}
-							for(k = 0, l = tmp.parents.length; k < l; k++) {
-								if(o[tmp.parents[k]] === undefined && tmp.parents[k] !== $.jstree.root) {
-									o[tmp.parents[k]] = true;
-									p.push(tmp.parents[k]);
-								}
-							}
+					if (!tmp.state.loaded) {
+						if (tmp.original && tmp.original.state && tmp.original.state.undetermined && tmp.original.state.undetermined === true) {
+							p.push(tmp.id);
+							p = p.concat(tmp.parents);
 						}
 					}
 					else {
-						for(i = 0, j = tmp.children_d.length; i < j; i++) {
+						for (i = 0, j = tmp.children_d.length; i < j; i++) {
 							tmp2 = m[tmp.children_d[i]];
-							if(!tmp2.state.loaded && tmp2.original && tmp2.original.state && tmp2.original.state.undetermined && tmp2.original.state.undetermined === true) {
-								if(o[tmp2.id] === undefined && tmp2.id !== $.jstree.root) {
-									o[tmp2.id] = true;
-									p.push(tmp2.id);
-								}
-								for(k = 0, l = tmp2.parents.length; k < l; k++) {
-									if(o[tmp2.parents[k]] === undefined && tmp2.parents[k] !== $.jstree.root) {
-										o[tmp2.parents[k]] = true;
-										p.push(tmp2.parents[k]);
-									}
-								}
+							if (!tmp2.state.loaded && tmp2.original && tmp2.original.state && tmp2.original.state.undetermined && tmp2.original.state.undetermined === true) {
+								p.push(tmp2.id);
+								p = p.concat(tmp2.parents);
 							}
 						}
 					}
 				});
+			p = $.vakata.array_unique(p);
+			p = $.vakata.array_remove_item(p, '#');
 
 			this.element.find('.jstree-undetermined').removeClass('jstree-undetermined');
-			for(i = 0, j = p.length; i < j; i++) {
-				if(!m[p[i]].state[ t ? 'selected' : 'checked' ]) {
+			for (i = 0, j = p.length; i < j; i++) {
+				if (!m[p[i]].state[ t ? 'selected' : 'checked' ]) {
 					s = this.get_node(p[i], true);
-					if(s && s.length) {
+					if (s && s.length) {
 						s.children('.jstree-anchor').children('.jstree-checkbox').addClass('jstree-undetermined');
 					}
 				}
 			}
 		};
-		this.redraw_node = function(obj, deep, is_callback, force_render) {
-			obj = parent.redraw_node.apply(this, arguments);
-			if(obj) {
-				var i, j, tmp = null, icon = null;
-				for(i = 0, j = obj.childNodes.length; i < j; i++) {
-					if(obj.childNodes[i] && obj.childNodes[i].className && obj.childNodes[i].className.indexOf("jstree-anchor") !== -1) {
+		this.redraw_node = function (obj, deep, is_callback) {
+			obj = parent.redraw_node.call(this, obj, deep, is_callback);
+			if (obj) {
+				var i, j, tmp = null;
+				for (i = 0, j = obj.childNodes.length; i < j; i++) {
+					if (obj.childNodes[i] && obj.childNodes[i].className && obj.childNodes[i].className.indexOf("jstree-anchor") !== -1) {
 						tmp = obj.childNodes[i];
 						break;
 					}
 				}
-				if(tmp) {
-					if(!this.settings.checkbox.tie_selection && this._model.data[obj.id].state.checked) { tmp.className += ' jstree-checked'; }
-					icon = _i.cloneNode(false);
-					if(this._model.data[obj.id].state.checkbox_disabled) { icon.className += ' jstree-checkbox-disabled'; }
-					tmp.insertBefore(icon, tmp.childNodes[0]);
+				if (tmp) {
+					if (!this.settings.checkbox.tie_selection && this._model.data[obj.id].state.checked) {
+						tmp.className += ' jstree-checked';
+					}
+					tmp.insertBefore(_i.cloneNode(false), tmp.childNodes[0]);
 				}
 			}
-			if(!is_callback && this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
-				if(this._data.checkbox.uto) { clearTimeout(this._data.checkbox.uto); }
+			if (!is_callback && this.settings.checkbox.cascade.indexOf('undetermined') !== -1) {
+				if (this._data.checkbox.uto) {
+					clearTimeout(this._data.checkbox.uto);
+				}
 				this._data.checkbox.uto = setTimeout($.proxy(this._undetermined, this), 50);
 			}
 			return obj;
@@ -5122,19 +4798,31 @@
 		 * @name show_checkboxes()
 		 * @plugin checkbox
 		 */
-		this.show_checkboxes = function () { this._data.core.themes.checkboxes = true; this.get_container_ul().removeClass("jstree-no-checkboxes"); };
+		this.show_checkboxes = function () {
+			this._data.core.themes.checkboxes = true;
+			this.get_container_ul().removeClass("jstree-no-checkboxes");
+		};
 		/**
 		 * hide the node checkbox icons
 		 * @name hide_checkboxes()
 		 * @plugin checkbox
 		 */
-		this.hide_checkboxes = function () { this._data.core.themes.checkboxes = false; this.get_container_ul().addClass("jstree-no-checkboxes"); };
+		this.hide_checkboxes = function () {
+			this._data.core.themes.checkboxes = false;
+			this.get_container_ul().addClass("jstree-no-checkboxes");
+		};
 		/**
 		 * toggle the node icons
 		 * @name toggle_checkboxes()
 		 * @plugin checkbox
 		 */
-		this.toggle_checkboxes = function () { if(this._data.core.themes.checkboxes) { this.hide_checkboxes(); } else { this.show_checkboxes(); } };
+		this.toggle_checkboxes = function () {
+			if (this._data.core.themes.checkboxes) {
+				this.hide_checkboxes();
+			} else {
+				this.show_checkboxes();
+			}
+		};
 		/**
 		 * checks if a node is in an undetermined state
 		 * @name is_undetermined(obj)
@@ -5144,112 +4832,34 @@
 		this.is_undetermined = function (obj) {
 			obj = this.get_node(obj);
 			var s = this.settings.checkbox.cascade, i, j, t = this.settings.checkbox.tie_selection, d = this._data[ t ? 'core' : 'checkbox' ].selected, m = this._model.data;
-			if(!obj || obj.state[ t ? 'selected' : 'checked' ] === true || s.indexOf('undetermined') === -1 || (s.indexOf('down') === -1 && s.indexOf('up') === -1)) {
+			if (!obj || obj.state[ t ? 'selected' : 'checked' ] === true || s.indexOf('undetermined') === -1 || (s.indexOf('down') === -1 && s.indexOf('up') === -1)) {
 				return false;
 			}
-			if(!obj.state.loaded && obj.original.state.undetermined === true) {
+			if (!obj.state.loaded && obj.original.state.undetermined === true) {
 				return true;
 			}
-			for(i = 0, j = obj.children_d.length; i < j; i++) {
-				if($.inArray(obj.children_d[i], d) !== -1 || (!m[obj.children_d[i]].state.loaded && m[obj.children_d[i]].original.state.undetermined)) {
+			for (i = 0, j = obj.children_d.length; i < j; i++) {
+				if ($.inArray(obj.children_d[i], d) !== -1 || (!m[obj.children_d[i]].state.loaded && m[obj.children_d[i]].original.state.undetermined)) {
 					return true;
 				}
 			}
 			return false;
 		};
-		/**
-		 * disable a node's checkbox
-		 * @name disable_checkbox(obj)
-		 * @param {mixed} obj an array can be used too
-		 * @trigger disable_checkbox.jstree
-		 * @plugin checkbox
-		 */
-		this.disable_checkbox = function (obj) {
-			var t1, t2, dom;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.disable_checkbox(obj[t1]);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			dom = this.get_node(obj, true);
-			if(!obj.state.checkbox_disabled) {
-				obj.state.checkbox_disabled = true;
-				if(dom && dom.length) {
-					dom.children('.jstree-anchor').children('.jstree-checkbox').addClass('jstree-checkbox-disabled');
-				}
-				/**
-				 * triggered when an node's checkbox is disabled
-				 * @event
-				 * @name disable_checkbox.jstree
-				 * @param {Object} node
-				 * @plugin checkbox
-				 */
-				this.trigger('disable_checkbox', { 'node' : obj });
-			}
-		};
-		/**
-		 * enable a node's checkbox
-		 * @name disable_checkbox(obj)
-		 * @param {mixed} obj an array can be used too
-		 * @trigger enable_checkbox.jstree
-		 * @plugin checkbox
-		 */
-		this.enable_checkbox = function (obj) {
-			var t1, t2, dom;
-			if($.isArray(obj)) {
-				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
-					this.enable_checkbox(obj[t1]);
-				}
-				return true;
-			}
-			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
-				return false;
-			}
-			dom = this.get_node(obj, true);
-			if(obj.state.checkbox_disabled) {
-				obj.state.checkbox_disabled = false;
-				if(dom && dom.length) {
-					dom.children('.jstree-anchor').children('.jstree-checkbox').removeClass('jstree-checkbox-disabled');
-				}
-				/**
-				 * triggered when an node's checkbox is enabled
-				 * @event
-				 * @name enable_checkbox.jstree
-				 * @param {Object} node
-				 * @plugin checkbox
-				 */
-				this.trigger('enable_checkbox', { 'node' : obj });
-			}
-		};
 
 		this.activate_node = function (obj, e) {
-			if($(e.target).hasClass('jstree-checkbox-disabled')) {
-				return false;
-			}
-			if(this.settings.checkbox.tie_selection && (this.settings.checkbox.whole_node || $(e.target).hasClass('jstree-checkbox'))) {
+			if (this.settings.checkbox.tie_selection && (this.settings.checkbox.whole_node || $(e.target).hasClass('jstree-checkbox'))) {
 				e.ctrlKey = true;
 			}
-			if(this.settings.checkbox.tie_selection || (!this.settings.checkbox.whole_node && !$(e.target).hasClass('jstree-checkbox'))) {
+			if (this.settings.checkbox.tie_selection || (!this.settings.checkbox.whole_node && !$(e.target).hasClass('jstree-checkbox'))) {
 				return parent.activate_node.call(this, obj, e);
 			}
-			if(this.is_disabled(obj)) {
-				return false;
-			}
-			if(this.is_checked(obj)) {
+			if (this.is_checked(obj)) {
 				this.uncheck_node(obj, e);
 			}
 			else {
 				this.check_node(obj, e);
 			}
-			this.trigger('activate_node', { 'node' : this.get_node(obj) });
+			this.trigger('activate_node', { 'node': this.get_node(obj) });
 		};
 
 		/**
@@ -5260,24 +4870,26 @@
 		 * @plugin checkbox
 		 */
 		this.check_node = function (obj, e) {
-			if(this.settings.checkbox.tie_selection) { return this.select_node(obj, false, true, e); }
+			if (this.settings.checkbox.tie_selection) {
+				return this.select_node(obj, false, true, e);
+			}
 			var dom, t1, t2, th;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.check_node(obj[t1], e);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			dom = this.get_node(obj, true);
-			if(!obj.state.checked) {
+			if (!obj.state.checked) {
 				obj.state.checked = true;
 				this._data.checkbox.selected.push(obj.id);
-				if(dom && dom.length) {
+				if (dom && dom.length) {
 					dom.children('.jstree-anchor').addClass('jstree-checked');
 				}
 				/**
@@ -5289,35 +4901,37 @@
 				 * @param {Object} event the event (if any) that triggered this check_node
 				 * @plugin checkbox
 				 */
-				this.trigger('check_node', { 'node' : obj, 'selected' : this._data.checkbox.selected, 'event' : e });
+				this.trigger('check_node', { 'node': obj, 'selected': this._data.checkbox.selected, 'event': e });
 			}
 		};
 		/**
 		 * uncheck a node (only if tie_selection in checkbox settings is false, otherwise deselect_node will be called internally)
-		 * @name uncheck_node(obj)
-		 * @param {mixed} obj an array can be used to uncheck multiple nodes
+		 * @name deselect_node(obj)
+		 * @param {mixed} obj an array can be used to deselect multiple nodes
 		 * @trigger uncheck_node.jstree
 		 * @plugin checkbox
 		 */
 		this.uncheck_node = function (obj, e) {
-			if(this.settings.checkbox.tie_selection) { return this.deselect_node(obj, false, e); }
+			if (this.settings.checkbox.tie_selection) {
+				return this.deselect_node(obj, false, e);
+			}
 			var t1, t2, dom;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.uncheck_node(obj[t1], e);
 				}
 				return true;
 			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) {
+			if (!obj || obj.id === '#') {
 				return false;
 			}
 			dom = this.get_node(obj, true);
-			if(obj.state.checked) {
+			if (obj.state.checked) {
 				obj.state.checked = false;
 				this._data.checkbox.selected = $.vakata.array_remove_item(this._data.checkbox.selected, obj.id);
-				if(dom.length) {
+				if (dom.length) {
 					dom.children('.jstree-anchor').removeClass('jstree-checked');
 				}
 				/**
@@ -5329,7 +4943,7 @@
 				 * @param {Object} event the event (if any) that triggered this uncheck_node
 				 * @plugin checkbox
 				 */
-				this.trigger('uncheck_node', { 'node' : obj, 'selected' : this._data.checkbox.selected, 'event' : e });
+				this.trigger('uncheck_node', { 'node': obj, 'selected': this._data.checkbox.selected, 'event': e });
 			}
 		};
 		/**
@@ -5339,11 +4953,13 @@
 		 * @plugin checkbox
 		 */
 		this.check_all = function () {
-			if(this.settings.checkbox.tie_selection) { return this.select_all(); }
+			if (this.settings.checkbox.tie_selection) {
+				return this.select_all();
+			}
 			var tmp = this._data.checkbox.selected.concat([]), i, j;
-			this._data.checkbox.selected = this._model.data[$.jstree.root].children_d.concat();
-			for(i = 0, j = this._data.checkbox.selected.length; i < j; i++) {
-				if(this._model.data[this._data.checkbox.selected[i]]) {
+			this._data.checkbox.selected = this._model.data['#'].children_d.concat();
+			for (i = 0, j = this._data.checkbox.selected.length; i < j; i++) {
+				if (this._model.data[this._data.checkbox.selected[i]]) {
 					this._model.data[this._data.checkbox.selected[i]].state.checked = true;
 				}
 			}
@@ -5355,7 +4971,7 @@
 			 * @param {Array} selected the current selection
 			 * @plugin checkbox
 			 */
-			this.trigger('check_all', { 'selected' : this._data.checkbox.selected });
+			this.trigger('check_all', { 'selected': this._data.checkbox.selected });
 		};
 		/**
 		 * uncheck all checked nodes (only if tie_selection in checkbox settings is false, otherwise deselect_all will be called internally)
@@ -5364,10 +4980,12 @@
 		 * @plugin checkbox
 		 */
 		this.uncheck_all = function () {
-			if(this.settings.checkbox.tie_selection) { return this.deselect_all(); }
+			if (this.settings.checkbox.tie_selection) {
+				return this.deselect_all();
+			}
 			var tmp = this._data.checkbox.selected.concat([]), i, j;
-			for(i = 0, j = this._data.checkbox.selected.length; i < j; i++) {
-				if(this._model.data[this._data.checkbox.selected[i]]) {
+			for (i = 0, j = this._data.checkbox.selected.length; i < j; i++) {
+				if (this._model.data[this._data.checkbox.selected[i]]) {
 					this._model.data[this._data.checkbox.selected[i]].state.checked = false;
 				}
 			}
@@ -5381,7 +4999,7 @@
 			 * @param {Array} selected the current selection
 			 * @plugin checkbox
 			 */
-			this.trigger('uncheck_all', { 'selected' : this._data.checkbox.selected, 'node' : tmp });
+			this.trigger('uncheck_all', { 'selected': this._data.checkbox.selected, 'node': tmp });
 		};
 		/**
 		 * checks if a node is checked (if tie_selection is on in the settings this function will return the same as is_selected)
@@ -5391,9 +5009,13 @@
 		 * @plugin checkbox
 		 */
 		this.is_checked = function (obj) {
-			if(this.settings.checkbox.tie_selection) { return this.is_selected(obj); }
+			if (this.settings.checkbox.tie_selection) {
+				return this.is_selected(obj);
+			}
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
+			if (!obj || obj.id === '#') {
+				return false;
+			}
 			return obj.state.checked;
 		};
 		/**
@@ -5404,8 +5026,12 @@
 		 * @plugin checkbox
 		 */
 		this.get_checked = function (full) {
-			if(this.settings.checkbox.tie_selection) { return this.get_selected(full); }
-			return full ? $.map(this._data.checkbox.selected, $.proxy(function (i) { return this.get_node(i); }, this)) : this._data.checkbox.selected;
+			if (this.settings.checkbox.tie_selection) {
+				return this.get_selected(full);
+			}
+			return full ? $.map(this._data.checkbox.selected, $.proxy(function (i) {
+				return this.get_node(i);
+			}, this)) : this._data.checkbox.selected;
 		};
 		/**
 		 * get an array of all top level checked nodes (ignoring children of checked nodes) (if tie_selection is on in the settings this function will return the same as get_top_selected)
@@ -5415,26 +5041,30 @@
 		 * @plugin checkbox
 		 */
 		this.get_top_checked = function (full) {
-			if(this.settings.checkbox.tie_selection) { return this.get_top_selected(full); }
+			if (this.settings.checkbox.tie_selection) {
+				return this.get_top_selected(full);
+			}
 			var tmp = this.get_checked(true),
 				obj = {}, i, j, k, l;
-			for(i = 0, j = tmp.length; i < j; i++) {
+			for (i = 0, j = tmp.length; i < j; i++) {
 				obj[tmp[i].id] = tmp[i];
 			}
-			for(i = 0, j = tmp.length; i < j; i++) {
-				for(k = 0, l = tmp[i].children_d.length; k < l; k++) {
-					if(obj[tmp[i].children_d[k]]) {
+			for (i = 0, j = tmp.length; i < j; i++) {
+				for (k = 0, l = tmp[i].children_d.length; k < l; k++) {
+					if (obj[tmp[i].children_d[k]]) {
 						delete obj[tmp[i].children_d[k]];
 					}
 				}
 			}
 			tmp = [];
-			for(i in obj) {
-				if(obj.hasOwnProperty(i)) {
+			for (i in obj) {
+				if (obj.hasOwnProperty(i)) {
 					tmp.push(i);
 				}
 			}
-			return full ? $.map(tmp, $.proxy(function (i) { return this.get_node(i); }, this)) : tmp;
+			return full ? $.map(tmp, $.proxy(function (i) {
+				return this.get_node(i);
+			}, this)) : tmp;
 		};
 		/**
 		 * get an array of all bottom level checked nodes (ignoring selected parents) (if tie_selection is on in the settings this function will return the same as get_bottom_selected)
@@ -5444,91 +5074,31 @@
 		 * @plugin checkbox
 		 */
 		this.get_bottom_checked = function (full) {
-			if(this.settings.checkbox.tie_selection) { return this.get_bottom_selected(full); }
+			if (this.settings.checkbox.tie_selection) {
+				return this.get_bottom_selected(full);
+			}
 			var tmp = this.get_checked(true),
 				obj = [], i, j;
-			for(i = 0, j = tmp.length; i < j; i++) {
-				if(!tmp[i].children.length) {
+			for (i = 0, j = tmp.length; i < j; i++) {
+				if (!tmp[i].children.length) {
 					obj.push(tmp[i].id);
 				}
 			}
-			return full ? $.map(obj, $.proxy(function (i) { return this.get_node(i); }, this)) : obj;
-		};
-		this.load_node = function (obj, callback) {
-			var k, l, i, j, c, tmp;
-			if(!$.isArray(obj) && !this.settings.checkbox.tie_selection) {
-				tmp = this.get_node(obj);
-				if(tmp && tmp.state.loaded) {
-					for(k = 0, l = tmp.children_d.length; k < l; k++) {
-						if(this._model.data[tmp.children_d[k]].state.checked) {
-							c = true;
-							this._data.checkbox.selected = $.vakata.array_remove_item(this._data.checkbox.selected, tmp.children_d[k]);
-						}
-					}
-				}
-			}
-			return parent.load_node.apply(this, arguments);
-		};
-		this.get_state = function () {
-			var state = parent.get_state.apply(this, arguments);
-			if(this.settings.checkbox.tie_selection) { return state; }
-			state.checkbox = this._data.checkbox.selected.slice();
-			return state;
-		};
-		this.set_state = function (state, callback) {
-			var res = parent.set_state.apply(this, arguments);
-			if(res && state.checkbox) {
-				if(!this.settings.checkbox.tie_selection) {
-					this.uncheck_all();
-					var _this = this;
-					$.each(state.checkbox, function (i, v) {
-						_this.check_node(v);
-					});
-				}
-				delete state.checkbox;
-				this.set_state(state, callback);
-				return false;
-			}
-			return res;
-		};
-		this.refresh = function (skip_loading, forget_state) {
-			if(!this.settings.checkbox.tie_selection) {
-				this._data.checkbox.selected = [];
-			}
-			return parent.refresh.apply(this, arguments);
+			return full ? $.map(obj, $.proxy(function (i) {
+				return this.get_node(i);
+			}, this)) : obj;
 		};
 	};
 
 	// include the checkbox plugin by default
 	// $.jstree.defaults.plugins.push("checkbox");
 
-/**
- * ### Conditionalselect plugin
- *
- * This plugin allows defining a callback to allow or deny node selection by user input (activate node method).
- */
-
 	/**
-	 * a callback (function) which is invoked in the instance's scope and receives two arguments - the node and the event that triggered the `activate_node` call. Returning false prevents working with the node, returning true allows invoking activate_node. Defaults to returning `true`.
-	 * @name $.jstree.defaults.checkbox.visible
-	 * @plugin checkbox
+	 * ### Contextmenu plugin
+	 *
+	 * Shows a context menu when a node is right-clicked.
 	 */
-	$.jstree.defaults.conditionalselect = function () { return true; };
-	$.jstree.plugins.conditionalselect = function (options, parent) {
-		// own function
-		this.activate_node = function (obj, e) {
-			if(this.settings.conditionalselect.call(this, this.get_node(obj), e)) {
-				parent.activate_node.call(this, obj, e);
-			}
-		};
-	};
-
-
-/**
- * ### Contextmenu plugin
- *
- * Shows a context menu when a node is right-clicked.
- */
+// TODO: move logic outside of function + check multiple move
 
 	/**
 	 * stores all defaults for the contextmenu plugin
@@ -5541,13 +5111,13 @@
 		 * @name $.jstree.defaults.contextmenu.select_node
 		 * @plugin contextmenu
 		 */
-		select_node : true,
+		select_node: true,
 		/**
 		 * a boolean indicating if the menu should be shown aligned with the node. Defaults to `true`, otherwise the mouse coordinates are used.
 		 * @name $.jstree.defaults.contextmenu.show_at_node
 		 * @plugin contextmenu
 		 */
-		show_at_node : true,
+		show_at_node: true,
 		/**
 		 * an object of actions, or a function that accepts a node and a callback function and calls the callback function with an object of actions available for that node (you can also return the items too).
 		 *
@@ -5565,47 +5135,49 @@
 		 * @name $.jstree.defaults.contextmenu.items
 		 * @plugin contextmenu
 		 */
-		items : function (o, cb) { // Could be an object directly
+		items: function (o, cb) { // Could be an object directly
 			return {
-				"create" : {
-					"separator_before"	: false,
-					"separator_after"	: true,
-					"_disabled"			: false, //(this.check("create_node", data.reference, {}, "last")),
-					"label"				: "Create",
-					"action"			: function (data) {
+				"create": {
+					"separator_before": false,
+					"separator_after": true,
+					"_disabled": false, //(this.check("create_node", data.reference, {}, "last")),
+					"label": "Create",
+					"action": function (data) {
 						var inst = $.jstree.reference(data.reference),
 							obj = inst.get_node(data.reference);
 						inst.create_node(obj, {}, "last", function (new_node) {
-							setTimeout(function () { inst.edit(new_node); },0);
+							setTimeout(function () {
+								inst.edit(new_node);
+							}, 0);
 						});
 					}
 				},
-				"rename" : {
-					"separator_before"	: false,
-					"separator_after"	: false,
-					"_disabled"			: false, //(this.check("rename_node", data.reference, this.get_parent(data.reference), "")),
-					"label"				: "Rename",
+				"rename": {
+					"separator_before": false,
+					"separator_after": false,
+					"_disabled": false, //(this.check("rename_node", data.reference, this.get_parent(data.reference), "")),
+					"label": "Rename",
 					/*
-					"shortcut"			: 113,
-					"shortcut_label"	: 'F2',
-					"icon"				: "glyphicon glyphicon-leaf",
-					*/
-					"action"			: function (data) {
+					 "shortcut"			: 113,
+					 "shortcut_label"	: 'F2',
+					 "icon"				: "glyphicon glyphicon-leaf",
+					 */
+					"action": function (data) {
 						var inst = $.jstree.reference(data.reference),
 							obj = inst.get_node(data.reference);
 						inst.edit(obj);
 					}
 				},
-				"remove" : {
-					"separator_before"	: false,
-					"icon"				: false,
-					"separator_after"	: false,
-					"_disabled"			: false, //(this.check("delete_node", data.reference, this.get_parent(data.reference), "")),
-					"label"				: "Delete",
-					"action"			: function (data) {
+				"remove": {
+					"separator_before": false,
+					"icon": false,
+					"separator_after": false,
+					"_disabled": false, //(this.check("delete_node", data.reference, this.get_parent(data.reference), "")),
+					"label": "Delete",
+					"action": function (data) {
 						var inst = $.jstree.reference(data.reference),
 							obj = inst.get_node(data.reference);
-						if(inst.is_selected(obj)) {
+						if (inst.is_selected(obj)) {
 							inst.delete_node(inst.get_selected());
 						}
 						else {
@@ -5613,53 +5185,53 @@
 						}
 					}
 				},
-				"ccp" : {
-					"separator_before"	: true,
-					"icon"				: false,
-					"separator_after"	: false,
-					"label"				: "Edit",
-					"action"			: false,
-					"submenu" : {
-						"cut" : {
-							"separator_before"	: false,
-							"separator_after"	: false,
-							"label"				: "Cut",
-							"action"			: function (data) {
+				"ccp": {
+					"separator_before": true,
+					"icon": false,
+					"separator_after": false,
+					"label": "Edit",
+					"action": false,
+					"submenu": {
+						"cut": {
+							"separator_before": false,
+							"separator_after": false,
+							"label": "Cut",
+							"action": function (data) {
 								var inst = $.jstree.reference(data.reference),
 									obj = inst.get_node(data.reference);
-								if(inst.is_selected(obj)) {
-									inst.cut(inst.get_top_selected());
+								if (inst.is_selected(obj)) {
+									inst.cut(inst.get_selected());
 								}
 								else {
 									inst.cut(obj);
 								}
 							}
 						},
-						"copy" : {
-							"separator_before"	: false,
-							"icon"				: false,
-							"separator_after"	: false,
-							"label"				: "Copy",
-							"action"			: function (data) {
+						"copy": {
+							"separator_before": false,
+							"icon": false,
+							"separator_after": false,
+							"label": "Copy",
+							"action": function (data) {
 								var inst = $.jstree.reference(data.reference),
 									obj = inst.get_node(data.reference);
-								if(inst.is_selected(obj)) {
-									inst.copy(inst.get_top_selected());
+								if (inst.is_selected(obj)) {
+									inst.copy(inst.get_selected());
 								}
 								else {
 									inst.copy(obj);
 								}
 							}
 						},
-						"paste" : {
-							"separator_before"	: false,
-							"icon"				: false,
-							"_disabled"			: function (data) {
+						"paste": {
+							"separator_before": false,
+							"icon": false,
+							"_disabled": function (data) {
 								return !$.jstree.reference(data.reference).can_paste();
 							},
-							"separator_after"	: false,
-							"label"				: "Paste",
-							"action"			: function (data) {
+							"separator_after": false,
+							"label": "Paste",
+							"action": function (data) {
 								var inst = $.jstree.reference(data.reference),
 									obj = inst.get_node(data.reference);
 								inst.paste(obj);
@@ -5675,73 +5247,47 @@
 		this.bind = function () {
 			parent.bind.call(this);
 
-			var last_ts = 0, cto = null, ex, ey;
+			var last_ts = 0;
 			this.element
-				.on("contextmenu.jstree", ".jstree-anchor", $.proxy(function (e, data) {
-						e.preventDefault();
-						last_ts = e.ctrlKey ? +new Date() : 0;
-						if(data || cto) {
-							last_ts = (+new Date()) + 10000;
-						}
-						if(cto) {
-							clearTimeout(cto);
-						}
-						if(!this.is_loading(e.currentTarget)) {
-							this.show_contextmenu(e.currentTarget, e.pageX, e.pageY, e);
-						}
-					}, this))
+				.on("contextmenu.jstree", ".jstree-anchor", $.proxy(function (e) {
+					e.preventDefault();
+					last_ts = e.ctrlKey ? e.timeStamp : 0;
+					if (!this.is_loading(e.currentTarget)) {
+						this.show_contextmenu(e.currentTarget, e.pageX, e.pageY, e);
+					}
+				}, this))
 				.on("click.jstree", ".jstree-anchor", $.proxy(function (e) {
-						if(this._data.contextmenu.visible && (!last_ts || (+new Date()) - last_ts > 250)) { // work around safari & macOS ctrl+click
-							$.vakata.context.hide();
-						}
-						last_ts = 0;
-					}, this))
-				.on("touchstart.jstree", ".jstree-anchor", function (e) {
-						if(!e.originalEvent || !e.originalEvent.changedTouches || !e.originalEvent.changedTouches[0]) {
-							return;
-						}
-						ex = e.pageX;
-						ey = e.pageY;
-						cto = setTimeout(function () {
-							$(e.currentTarget).trigger('contextmenu', true);
-						}, 750);
-					})
-				.on('touchmove.vakata.jstree', function (e) {
-						if(cto && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0] && (Math.abs(ex - e.pageX) > 50 || Math.abs(ey - e.pageY) > 50)) {
-							clearTimeout(cto);
-						}
-					})
-				.on('touchend.vakata.jstree', function (e) {
-						if(cto) {
-							clearTimeout(cto);
-						}
-					});
-
+					if (this._data.contextmenu.visible && (!last_ts || e.timeStamp - last_ts > 250)) { // work around safari & macOS ctrl+click
+						$.vakata.context.hide();
+					}
+				}, this));
 			/*
-			if(!('oncontextmenu' in document.body) && ('ontouchstart' in document.body)) {
-				var el = null, tm = null;
-				this.element
-					.on("touchstart", ".jstree-anchor", function (e) {
-						el = e.currentTarget;
-						tm = +new Date();
-						$(document).one("touchend", function (e) {
-							e.target = document.elementFromPoint(e.originalEvent.targetTouches[0].pageX - window.pageXOffset, e.originalEvent.targetTouches[0].pageY - window.pageYOffset);
-							e.currentTarget = e.target;
-							tm = ((+(new Date())) - tm);
-							if(e.target === el && tm > 600 && tm < 1000) {
-								e.preventDefault();
-								$(el).trigger('contextmenu', e);
-							}
-							el = null;
-							tm = null;
-						});
-					});
-			}
-			*/
-			$(document).on("context_hide.vakata.jstree", $.proxy(function () { this._data.contextmenu.visible = false; }, this));
+			 if(!('oncontextmenu' in document.body) && ('ontouchstart' in document.body)) {
+			 var el = null, tm = null;
+			 this.element
+			 .on("touchstart", ".jstree-anchor", function (e) {
+			 el = e.currentTarget;
+			 tm = +new Date();
+			 $(document).one("touchend", function (e) {
+			 e.target = document.elementFromPoint(e.originalEvent.targetTouches[0].pageX - window.pageXOffset, e.originalEvent.targetTouches[0].pageY - window.pageYOffset);
+			 e.currentTarget = e.target;
+			 tm = ((+(new Date())) - tm);
+			 if(e.target === el && tm > 600 && tm < 1000) {
+			 e.preventDefault();
+			 $(el).trigger('contextmenu', e);
+			 }
+			 el = null;
+			 tm = null;
+			 });
+			 });
+			 }
+			 */
+			$(document).on("context_hide.vakata", $.proxy(function () {
+				this._data.contextmenu.visible = false;
+			}, this));
 		};
 		this.teardown = function () {
-			if(this._data.contextmenu.visible) {
+			if (this._data.contextmenu.visible) {
 				$.vakata.context.hide();
 			}
 			parent.teardown.call(this);
@@ -5759,28 +5305,30 @@
 		 */
 		this.show_contextmenu = function (obj, x, y, e) {
 			obj = this.get_node(obj);
-			if(!obj || obj.id === $.jstree.root) { return false; }
+			if (!obj || obj.id === '#') {
+				return false;
+			}
 			var s = this.settings.contextmenu,
 				d = this.get_node(obj, true),
 				a = d.children(".jstree-anchor"),
 				o = false,
 				i = false;
-			if(s.show_at_node || x === undefined || y === undefined) {
+			if (s.show_at_node || x === undefined || y === undefined) {
 				o = a.offset();
 				x = o.left;
 				y = o.top + this._data.core.li_height;
 			}
-			if(this.settings.contextmenu.select_node && !this.is_selected(obj)) {
+			if (this.settings.contextmenu.select_node && !this.is_selected(obj)) {
 				this.activate_node(obj, e);
 			}
 
 			i = s.items;
-			if($.isFunction(i)) {
+			if ($.isFunction(i)) {
 				i = i.call(this, obj, $.proxy(function (i) {
 					this._show_contextmenu(obj, x, y, i);
 				}, this));
 			}
-			if($.isPlainObject(i)) {
+			if ($.isPlainObject(i)) {
 				this._show_contextmenu(obj, x, y, i);
 			}
 		};
@@ -5798,12 +5346,12 @@
 		this._show_contextmenu = function (obj, x, y, i) {
 			var d = this.get_node(obj, true),
 				a = d.children(".jstree-anchor");
-			$(document).one("context_show.vakata.jstree", $.proxy(function (e, data) {
+			$(document).one("context_show.vakata", $.proxy(function (e, data) {
 				var cls = 'jstree-contextmenu jstree-' + this.get_theme() + '-contextmenu';
 				$(data.element).addClass(cls);
 			}, this));
 			this._data.contextmenu.visible = true;
-			$.vakata.context.show(a, { 'x' : x, 'y' : y }, i);
+			$.vakata.context.show(a, { 'x': x, 'y': y }, i);
 			/**
 			 * triggered when the contextmenu is shown for a node
 			 * @event
@@ -5813,7 +5361,7 @@
 			 * @param {Number} y the y-coordinate of the menu relative to the document
 			 * @plugin contextmenu
 			 */
-			this.trigger('show_contextmenu', { "node" : obj, "x" : x, "y" : y });
+			this.trigger('show_contextmenu', { "node": obj, "x": x, "y": y });
 		};
 	};
 
@@ -5821,83 +5369,97 @@
 	(function ($) {
 		var right_to_left = false,
 			vakata_context = {
-				element		: false,
-				reference	: false,
-				position_x	: 0,
-				position_y	: 0,
-				items		: [],
-				html		: "",
-				is_visible	: false
+				element: false,
+				reference: false,
+				position_x: 0,
+				position_y: 0,
+				items: [],
+				html: "",
+				is_visible: false
 			};
 
 		$.vakata.context = {
-			settings : {
-				hide_onmouseleave	: 0,
-				icons				: true
+			settings: {
+				hide_onmouseleave: 0,
+				icons: true
 			},
-			_trigger : function (event_name) {
+			_trigger: function (event_name) {
 				$(document).triggerHandler("context_" + event_name + ".vakata", {
-					"reference"	: vakata_context.reference,
-					"element"	: vakata_context.element,
-					"position"	: {
-						"x" : vakata_context.position_x,
-						"y" : vakata_context.position_y
+					"reference": vakata_context.reference,
+					"element": vakata_context.element,
+					"position": {
+						"x": vakata_context.position_x,
+						"y": vakata_context.position_y
 					}
 				});
 			},
-			_execute : function (i) {
+			_execute: function (i) {
 				i = vakata_context.items[i];
-				return i && (!i._disabled || ($.isFunction(i._disabled) && !i._disabled({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }))) && i.action ? i.action.call(null, {
-							"item"		: i,
-							"reference"	: vakata_context.reference,
-							"element"	: vakata_context.element,
-							"position"	: {
-								"x" : vakata_context.position_x,
-								"y" : vakata_context.position_y
-							}
-						}) : false;
+				return i && (!i._disabled || ($.isFunction(i._disabled) && !i._disabled({ "item": i, "reference": vakata_context.reference, "element": vakata_context.element }))) && i.action ? i.action.call(null, {
+					"item": i,
+					"reference": vakata_context.reference,
+					"element": vakata_context.element,
+					"position": {
+						"x": vakata_context.position_x,
+						"y": vakata_context.position_y
+					}
+				}) : false;
 			},
-			_parse : function (o, is_callback) {
-				if(!o) { return false; }
-				if(!is_callback) {
-					vakata_context.html		= "";
-					vakata_context.items	= [];
+			_parse: function (o, is_callback) {
+				if (!o) {
+					return false;
+				}
+				if (!is_callback) {
+					vakata_context.html = "";
+					vakata_context.items = [];
 				}
 				var str = "",
 					sep = false,
 					tmp;
 
-				if(is_callback) { str += "<"+"ul>"; }
+				if (is_callback) {
+					str += "<" + "ul>";
+				}
 				$.each(o, function (i, val) {
-					if(!val) { return true; }
+					if (!val) {
+						return true;
+					}
 					vakata_context.items.push(val);
-					if(!sep && val.separator_before) {
-						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<"+"/a><"+"/li>";
+					if (!sep && val.separator_before) {
+						str += "<" + "li class='vakata-context-separator'><" + "a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<" + "/a><" + "/li>";
 					}
 					sep = false;
-					str += "<"+"li class='" + (val._class || "") + (val._disabled === true || ($.isFunction(val._disabled) && val._disabled({ "item" : val, "reference" : vakata_context.reference, "element" : vakata_context.element })) ? " vakata-contextmenu-disabled " : "") + "' "+(val.shortcut?" data-shortcut='"+val.shortcut+"' ":'')+">";
-					str += "<"+"a href='#' rel='" + (vakata_context.items.length - 1) + "'>";
-					if($.vakata.context.settings.icons) {
-						str += "<"+"i ";
-						if(val.icon) {
-							if(val.icon.indexOf("/") !== -1 || val.icon.indexOf(".") !== -1) { str += " style='background:url(\"" + val.icon + "\") center center no-repeat' "; }
-							else { str += " class='" + val.icon + "' "; }
+					str += "<" + "li class='" + (val._class || "") + (val._disabled === true || ($.isFunction(val._disabled) && val._disabled({ "item": val, "reference": vakata_context.reference, "element": vakata_context.element })) ? " vakata-contextmenu-disabled " : "") + "' " + (val.shortcut ? " data-shortcut='" + val.shortcut + "' " : '') + ">";
+					str += "<" + "a href='#' rel='" + (vakata_context.items.length - 1) + "'>";
+					if ($.vakata.context.settings.icons) {
+						str += "<" + "i ";
+						if (val.icon) {
+							if (val.icon.indexOf("/") !== -1 || val.icon.indexOf(".") !== -1) {
+								str += " style='background:url(\"" + val.icon + "\") center center no-repeat' ";
+							}
+							else {
+								str += " class='" + val.icon + "' ";
+							}
 						}
-						str += "><"+"/i><"+"span class='vakata-contextmenu-sep'>&#160;<"+"/span>";
+						str += "><" + "/i><" + "span class='vakata-contextmenu-sep'>&#160;<" + "/span>";
 					}
-					str += ($.isFunction(val.label) ? val.label({ "item" : i, "reference" : vakata_context.reference, "element" : vakata_context.element }) : val.label) + (val.shortcut?' <span class="vakata-contextmenu-shortcut vakata-contextmenu-shortcut-'+val.shortcut+'">'+ (val.shortcut_label || '') +'</span>':'') + "<"+"/a>";
-					if(val.submenu) {
+					str += ($.isFunction(val.label) ? val.label({ "item": i, "reference": vakata_context.reference, "element": vakata_context.element }) : val.label) + (val.shortcut ? ' <span class="vakata-contextmenu-shortcut vakata-contextmenu-shortcut-' + val.shortcut + '">' + (val.shortcut_label || '') + '</span>' : '') + "<" + "/a>";
+					if (val.submenu) {
 						tmp = $.vakata.context._parse(val.submenu, true);
-						if(tmp) { str += tmp; }
+						if (tmp) {
+							str += tmp;
+						}
 					}
-					str += "<"+"/li>";
-					if(val.separator_after) {
-						str += "<"+"li class='vakata-context-separator'><"+"a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<"+"/a><"+"/li>";
+					str += "<" + "/li>";
+					if (val.separator_after) {
+						str += "<" + "li class='vakata-context-separator'><" + "a href='#' " + ($.vakata.context.settings.icons ? '' : 'style="margin-left:0px;"') + ">&#160;<" + "/a><" + "/li>";
 						sep = true;
 					}
 				});
-				str  = str.replace(/<li class\='vakata-context-separator'\><\/li\>$/,"");
-				if(is_callback) { str += "</ul>"; }
+				str = str.replace(/<li class\='vakata-context-separator'\><\/li\>$/, "");
+				if (is_callback) {
+					str += "</ul>";
+				}
 				/**
 				 * triggered on the document when the contextmenu is parsed (HTML is built)
 				 * @event
@@ -5907,12 +5469,17 @@
 				 * @param {jQuery} element the DOM element of the menu itself
 				 * @param {Object} position the x & y coordinates of the menu
 				 */
-				if(!is_callback) { vakata_context.html = str; $.vakata.context._trigger("parse"); }
+				if (!is_callback) {
+					vakata_context.html = str;
+					$.vakata.context._trigger("parse");
+				}
 				return str.length > 10 ? str : false;
 			},
-			_show_submenu : function (o) {
+			_show_submenu: function (o) {
 				o = $(o);
-				if(!o.length || !o.children("ul").length) { return; }
+				if (!o.length || !o.children("ul").length) {
+					return;
+				}
 				var e = o.children("ul"),
 					x = o.offset().left + o.outerWidth(),
 					y = o.offset().top,
@@ -5920,50 +5487,49 @@
 					h = e.height(),
 					dw = $(window).width() + $(window).scrollLeft(),
 					dh = $(window).height() + $(window).scrollTop();
-				// може да се спести е една проверка - дали няма някой от класовете вече нагоре
-				if(right_to_left) {
+				// може да се спести е една проверка - дали няма някой от класовете вече нагоре
+				if (right_to_left) {
 					o[x - (w + 10 + o.outerWidth()) < 0 ? "addClass" : "removeClass"]("vakata-context-left");
 				}
 				else {
 					o[x + w + 10 > dw ? "addClass" : "removeClass"]("vakata-context-right");
 				}
-				if(y + h + 10 > dh) {
-					e.css("bottom","-1px");
+				if (y + h + 10 > dh) {
+					e.css("bottom", "-1px");
 				}
 				e.show();
 			},
-			show : function (reference, position, data) {
+			show: function (reference, position, data) {
 				var o, e, x, y, w, h, dw, dh, cond = true;
-				if(vakata_context.element && vakata_context.element.length) {
+				if (vakata_context.element && vakata_context.element.length) {
 					vakata_context.element.width('');
 				}
-				switch(cond) {
+				switch (cond) {
 					case (!position && !reference):
 						return false;
 					case (!!position && !!reference):
-						vakata_context.reference	= reference;
-						vakata_context.position_x	= position.x;
-						vakata_context.position_y	= position.y;
+						vakata_context.reference = reference;
+						vakata_context.position_x = position.x;
+						vakata_context.position_y = position.y;
 						break;
 					case (!position && !!reference):
-						vakata_context.reference	= reference;
+						vakata_context.reference = reference;
 						o = reference.offset();
-						vakata_context.position_x	= o.left + reference.outerHeight();
-						vakata_context.position_y	= o.top;
+						vakata_context.position_x = o.left + reference.outerHeight();
+						vakata_context.position_y = o.top;
 						break;
 					case (!!position && !reference):
-						vakata_context.position_x	= position.x;
-						vakata_context.position_y	= position.y;
+						vakata_context.position_x = position.x;
+						vakata_context.position_y = position.y;
 						break;
 				}
-				if(!!reference && !data && $(reference).data('vakata_contextmenu')) {
+				if (!!reference && !data && $(reference).data('vakata_contextmenu')) {
 					data = $(reference).data('vakata_contextmenu');
 				}
-				if($.vakata.context._parse(data)) {
+				if ($.vakata.context._parse(data)) {
 					vakata_context.element.html(vakata_context.html);
 				}
-				if(vakata_context.items.length) {
-					vakata_context.element.appendTo("body");
+				if (vakata_context.items.length) {
 					e = vakata_context.element;
 					x = vakata_context.position_x;
 					y = vakata_context.position_y;
@@ -5971,23 +5537,23 @@
 					h = e.height();
 					dw = $(window).width() + $(window).scrollLeft();
 					dh = $(window).height() + $(window).scrollTop();
-					if(right_to_left) {
-						x -= (e.outerWidth() - $(reference).outerWidth());
-						if(x < $(window).scrollLeft() + 20) {
+					if (right_to_left) {
+						x -= e.outerWidth();
+						if (x < $(window).scrollLeft() + 20) {
 							x = $(window).scrollLeft() + 20;
 						}
 					}
-					if(x + w + 20 > dw) {
+					if (x + w + 20 > dw) {
 						x = dw - (w + 20);
 					}
-					if(y + h + 20 > dh) {
+					if (y + h + 20 > dh) {
 						y = dh - (h + 20);
 					}
 
 					vakata_context.element
-						.css({ "left" : x, "top" : y })
+						.css({ "left": x, "top": y })
 						.show()
-						.find('a').first().focus().parent().addClass("vakata-context-hover");
+						.find('a:eq(0)').focus().parent().addClass("vakata-context-hover");
 					vakata_context.is_visible = true;
 					/**
 					 * triggered on the document when the contextmenu is shown
@@ -6001,9 +5567,9 @@
 					$.vakata.context._trigger("show");
 				}
 			},
-			hide : function () {
-				if(vakata_context.is_visible) {
-					vakata_context.element.hide().find("ul").hide().end().find(':focus').blur().end().detach();
+			hide: function () {
+				if (vakata_context.is_visible) {
+					vakata_context.element.hide().find("ul").hide().end().find(':focus').blur();
 					vakata_context.is_visible = false;
 					/**
 					 * triggered on the document when the contextmenu is hidden
@@ -6027,13 +5593,15 @@
 				.on("mouseenter", "li", function (e) {
 					e.stopImmediatePropagation();
 
-					if($.contains(this, e.relatedTarget)) {
-						// премахнато заради delegate mouseleave по-долу
+					if ($.contains(this, e.relatedTarget)) {
+						// премахнато заради delegate mouseleave по-долу
 						// $(this).find(".vakata-context-hover").removeClass("vakata-context-hover");
 						return;
 					}
 
-					if(to) { clearTimeout(to); }
+					if (to) {
+						clearTimeout(to);
+					}
 					vakata_context.element.find(".vakata-context-hover").removeClass("vakata-context-hover").end();
 
 					$(this)
@@ -6041,95 +5609,104 @@
 						.parentsUntil(".vakata-context", "li").addBack().addClass("vakata-context-hover");
 					$.vakata.context._show_submenu(this);
 				})
-				// тестово - дали не натоварва?
+				// тестово - дали не натоварва?
 				.on("mouseleave", "li", function (e) {
-					if($.contains(this, e.relatedTarget)) { return; }
+					if ($.contains(this, e.relatedTarget)) {
+						return;
+					}
 					$(this).find(".vakata-context-hover").addBack().removeClass("vakata-context-hover");
 				})
 				.on("mouseleave", function (e) {
 					$(this).find(".vakata-context-hover").removeClass("vakata-context-hover");
-					if($.vakata.context.settings.hide_onmouseleave) {
+					if ($.vakata.context.settings.hide_onmouseleave) {
 						to = setTimeout(
 							(function (t) {
-								return function () { $.vakata.context.hide(); };
+								return function () {
+									$.vakata.context.hide();
+								};
 							}(this)), $.vakata.context.settings.hide_onmouseleave);
 					}
 				})
 				.on("click", "a", function (e) {
 					e.preventDefault();
-				//})
-				//.on("mouseup", "a", function (e) {
-					if(!$(this).blur().parent().hasClass("vakata-context-disabled") && $.vakata.context._execute($(this).attr("rel")) !== false) {
+					//})
+					//.on("mouseup", "a", function (e) {
+					if (!$(this).blur().parent().hasClass("vakata-context-disabled") && $.vakata.context._execute($(this).attr("rel")) !== false) {
 						$.vakata.context.hide();
 					}
 				})
 				.on('keydown', 'a', function (e) {
-						var o = null;
-						switch(e.which) {
-							case 13:
-							case 32:
-								e.type = "mouseup";
+					var o = null;
+					switch (e.which) {
+						case 13:
+						case 32:
+							e.type = "mouseup";
+							e.preventDefault();
+							$(e.currentTarget).trigger(e);
+							break;
+						case 37:
+							if (vakata_context.is_visible) {
+								vakata_context.element.find(".vakata-context-hover").last().parents("li:eq(0)").find("ul").hide().find(".vakata-context-hover").removeClass("vakata-context-hover").end().end().children('a').focus();
+								e.stopImmediatePropagation();
 								e.preventDefault();
-								$(e.currentTarget).trigger(e);
-								break;
-							case 37:
-								if(vakata_context.is_visible) {
-									vakata_context.element.find(".vakata-context-hover").last().closest("li").first().find("ul").hide().find(".vakata-context-hover").removeClass("vakata-context-hover").end().end().children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
+							}
+							break;
+						case 38:
+							if (vakata_context.is_visible) {
+								o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").prevAll("li:not(.vakata-context-separator)").first();
+								if (!o.length) {
+									o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").last();
 								}
-								break;
-							case 38:
-								if(vakata_context.is_visible) {
-									o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").prevAll("li:not(.vakata-context-separator)").first();
-									if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").last(); }
-									o.addClass("vakata-context-hover").children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 39:
-								if(vakata_context.is_visible) {
-									vakata_context.element.find(".vakata-context-hover").last().children("ul").show().children("li:not(.vakata-context-separator)").removeClass("vakata-context-hover").first().addClass("vakata-context-hover").children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 40:
-								if(vakata_context.is_visible) {
-									o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").nextAll("li:not(.vakata-context-separator)").first();
-									if(!o.length) { o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").first(); }
-									o.addClass("vakata-context-hover").children('a').focus();
-									e.stopImmediatePropagation();
-									e.preventDefault();
-								}
-								break;
-							case 27:
-								$.vakata.context.hide();
+								o.addClass("vakata-context-hover").children('a').focus();
+								e.stopImmediatePropagation();
 								e.preventDefault();
-								break;
-							default:
-								//console.log(e.which);
-								break;
-						}
-					})
+							}
+							break;
+						case 39:
+							if (vakata_context.is_visible) {
+								vakata_context.element.find(".vakata-context-hover").last().children("ul").show().children("li:not(.vakata-context-separator)").removeClass("vakata-context-hover").first().addClass("vakata-context-hover").children('a').focus();
+								e.stopImmediatePropagation();
+								e.preventDefault();
+							}
+							break;
+						case 40:
+							if (vakata_context.is_visible) {
+								o = vakata_context.element.find("ul:visible").addBack().last().children(".vakata-context-hover").removeClass("vakata-context-hover").nextAll("li:not(.vakata-context-separator)").first();
+								if (!o.length) {
+									o = vakata_context.element.find("ul:visible").addBack().last().children("li:not(.vakata-context-separator)").first();
+								}
+								o.addClass("vakata-context-hover").children('a').focus();
+								e.stopImmediatePropagation();
+								e.preventDefault();
+							}
+							break;
+						case 27:
+							$.vakata.context.hide();
+							e.preventDefault();
+							break;
+						default:
+							//console.log(e.which);
+							break;
+					}
+				})
 				.on('keydown', function (e) {
 					e.preventDefault();
 					var a = vakata_context.element.find('.vakata-contextmenu-shortcut-' + e.which).parent();
-					if(a.parent().not('.vakata-context-disabled')) {
-						a.click();
+					if (a.parent().not('.vakata-context-disabled')) {
+						a.mouseup();
 					}
-				});
+				})
+				.appendTo("body");
 
 			$(document)
-				.on("mousedown.vakata.jstree", function (e) {
-					if(vakata_context.is_visible && !$.contains(vakata_context.element[0], e.target)) {
+				.on("mousedown", function (e) {
+					if (vakata_context.is_visible && !$.contains(vakata_context.element[0], e.target)) {
 						$.vakata.context.hide();
 					}
 				})
-				.on("context_show.vakata.jstree", function (e, data) {
+				.on("context_show.vakata", function (e, data) {
 					vakata_context.element.find("li:has(ul)").children("a").addClass("vakata-context-parent");
-					if(right_to_left) {
+					if (right_to_left) {
 						vakata_context.element.addClass("vakata-context-rtl").css("direction", "rtl");
 					}
 					// also apply a RTL class?
@@ -6139,11 +5716,11 @@
 	}($));
 	// $.jstree.defaults.plugins.push("contextmenu");
 
-/**
- * ### Drag'n'drop plugin
- *
- * Enables dragging and dropping of nodes in the tree, resulting in a move or copy operations.
- */
+	/**
+	 * ### Drag'n'drop plugin
+	 *
+	 * Enables dragging and dropping of nodes in the tree, resulting in a move or copy operations.
+	 */
 
 	/**
 	 * stores all defaults for the drag'n'drop plugin
@@ -6156,161 +5733,129 @@
 		 * @name $.jstree.defaults.dnd.copy
 		 * @plugin dnd
 		 */
-		copy : true,
+		copy: true,
 		/**
 		 * a number indicating how long a node should remain hovered while dragging to be opened. Defaults to `500`.
 		 * @name $.jstree.defaults.dnd.open_timeout
 		 * @plugin dnd
 		 */
-		open_timeout : 500,
+		open_timeout: 500,
 		/**
-		 * a function invoked each time a node is about to be dragged, invoked in the tree's scope and receives the nodes about to be dragged as an argument (array) and the event that started the drag - return `false` to prevent dragging
+		 * a function invoked each time a node is about to be dragged, invoked in the tree's scope and receives the nodes about to be dragged as an argument (array) - return `false` to prevent dragging
 		 * @name $.jstree.defaults.dnd.is_draggable
 		 * @plugin dnd
 		 */
-		is_draggable : true,
+		is_draggable: true,
 		/**
 		 * a boolean indicating if checks should constantly be made while the user is dragging the node (as opposed to checking only on drop), default is `true`
 		 * @name $.jstree.defaults.dnd.check_while_dragging
 		 * @plugin dnd
 		 */
-		check_while_dragging : true,
+		check_while_dragging: true,
 		/**
 		 * a boolean indicating if nodes from this tree should only be copied with dnd (as opposed to moved), default is `false`
 		 * @name $.jstree.defaults.dnd.always_copy
 		 * @plugin dnd
 		 */
-		always_copy : false,
+		always_copy: false,
 		/**
 		 * when dropping a node "inside", this setting indicates the position the node should go to - it can be an integer or a string: "first" (same as 0) or "last", default is `0`
 		 * @name $.jstree.defaults.dnd.inside_pos
 		 * @plugin dnd
 		 */
-		inside_pos : 0,
-		/**
-		 * when starting the drag on a node that is selected this setting controls if all selected nodes are dragged or only the single node, default is `true`, which means all selected nodes are dragged when the drag is started on a selected node
-		 * @name $.jstree.defaults.dnd.drag_selection
-		 * @plugin dnd
-		 */
-		drag_selection : true,
-		/**
-		 * controls whether dnd works on touch devices. If left as boolean true dnd will work the same as in desktop browsers, which in some cases may impair scrolling. If set to boolean false dnd will not work on touch devices. There is a special third option - string "selected" which means only selected nodes can be dragged on touch devices.
-		 * @name $.jstree.defaults.dnd.touch
-		 * @plugin dnd
-		 */
-		touch : true,
-		/**
-		 * controls whether items can be dropped anywhere on the node, not just on the anchor, by default only the node anchor is a valid drop target. Works best with the wholerow plugin. If enabled on mobile depending on the interface it might be hard for the user to cancel the drop, since the whole tree container will be a valid drop target.
-		 * @name $.jstree.defaults.dnd.large_drop_target
-		 * @plugin dnd
-		 */
-		large_drop_target : false,
-		/**
-		 * controls whether a drag can be initiated from any part of the node and not just the text/icon part, works best with the wholerow plugin. Keep in mind it can cause problems with tree scrolling on mobile depending on the interface - in that case set the touch option to "selected".
-		 * @name $.jstree.defaults.dnd.large_drag_target
-		 * @plugin dnd
-		 */
-		large_drag_target : false
+		inside_pos: 0
 	};
 	// TODO: now check works by checking for each node individually, how about max_children, unique, etc?
+	// TODO: drop somewhere else - maybe demo only?
 	$.jstree.plugins.dnd = function (options, parent) {
 		this.bind = function () {
 			parent.bind.call(this);
 
 			this.element
-				.on('mousedown.jstree touchstart.jstree', this.settings.dnd.large_drag_target ? '.jstree-node' : '.jstree-anchor', $.proxy(function (e) {
-					if(this.settings.dnd.large_drag_target && $(e.target).closest('.jstree-node')[0] !== e.currentTarget) {
-						return true;
-					}
-					if(e.type === "touchstart" && (!this.settings.dnd.touch || (this.settings.dnd.touch === 'selected' && !$(e.currentTarget).closest('.jstree-node').children('.jstree-anchor').hasClass('jstree-clicked')))) {
-						return true;
-					}
+				.on('mousedown.jstree touchstart.jstree', '.jstree-anchor', $.proxy(function (e) {
 					var obj = this.get_node(e.target),
-						mlt = this.is_selected(obj) && this.settings.dnd.drag_selection ? this.get_top_selected().length : 1,
-						txt = (mlt > 1 ? mlt + ' ' + this.get_string('nodes') : this.get_text(e.currentTarget));
-					if(this.settings.core.force_text) {
-						txt = $.vakata.html.escape(txt);
-					}
-					if(obj && obj.id && obj.id !== $.jstree.root && (e.which === 1 || e.type === "touchstart") &&
-						(this.settings.dnd.is_draggable === true || ($.isFunction(this.settings.dnd.is_draggable) && this.settings.dnd.is_draggable.call(this, (mlt > 1 ? this.get_top_selected(true) : [obj]), e)))
+						mlt = this.is_selected(obj) ? this.get_selected().length : 1;
+					if (obj && obj.id && obj.id !== "#" && (e.which === 1 || e.type === "touchstart") &&
+						(this.settings.dnd.is_draggable === true || ($.isFunction(this.settings.dnd.is_draggable) && this.settings.dnd.is_draggable.call(this, (mlt > 1 ? this.get_selected(true) : [obj]))))
 					) {
 						this.element.trigger('mousedown.jstree');
-						return $.vakata.dnd.start(e, { 'jstree' : true, 'origin' : this, 'obj' : this.get_node(obj,true), 'nodes' : mlt > 1 ? this.get_top_selected() : [obj.id] }, '<div id="jstree-dnd" class="jstree-' + this.get_theme() + ' jstree-' + this.get_theme() + '-' + this.get_theme_variant() + ' ' + ( this.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ) + '"><i class="jstree-icon jstree-er"></i>' + txt + '<ins class="jstree-copy" style="display:none;">+</ins></div>');
+						return $.vakata.dnd.start(e, { 'jstree': true, 'origin': this, 'obj': this.get_node(obj, true), 'nodes': mlt > 1 ? this.get_selected() : [obj.id] }, '<div id="jstree-dnd" class="jstree-' + this.get_theme() + ( this.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ) + '"><i class="jstree-icon jstree-er"></i>' + (mlt > 1 ? mlt + ' ' + this.get_string('nodes') : this.get_text(e.currentTarget, true)) + '<ins class="jstree-copy" style="display:none;">+</ins></div>');
 					}
 				}, this));
 		};
 	};
 
-	$(function() {
+	$(function () {
 		// bind only once for all instances
 		var lastmv = false,
 			laster = false,
-			lastev = false,
 			opento = false,
-			marker = $('<div id="jstree-marker">&#160;</div>').hide(); //.appendTo('body');
+			marker = $('<div id="jstree-marker">&#160;</div>').hide().appendTo('body');
 
 		$(document)
-			.on('dnd_start.vakata.jstree', function (e, data) {
+			.bind('dnd_start.vakata', function (e, data) {
 				lastmv = false;
-				lastev = false;
-				if(!data || !data.data || !data.data.jstree) { return; }
-				marker.appendTo('body'); //.show();
 			})
-			.on('dnd_move.vakata.jstree', function (e, data) {
-				if(opento) { clearTimeout(opento); }
-				if(!data || !data.data || !data.data.jstree) { return; }
+			.bind('dnd_move.vakata', function (e, data) {
+				if (opento) {
+					clearTimeout(opento);
+				}
+				if (!data || !data.data || !data.data.jstree) {
+					return;
+				}
 
 				// if we are hovering the marker image do nothing (can happen on "inside" drags)
-				if(data.event.target.id && data.event.target.id === 'jstree-marker') {
+				if (data.event.target.id && data.event.target.id === 'jstree-marker') {
 					return;
 				}
-				lastev = data.event;
 
 				var ins = $.jstree.reference(data.event.target),
 					ref = false,
 					off = false,
 					rel = false,
-					tmp, l, t, h, p, i, o, ok, t1, t2, op, ps, pr, ip, tm;
+					l, t, h, p, i, o, ok, t1, t2, op, ps, pr, ip, tm;
 				// if we are over an instance
-				if(ins && ins._data && ins._data.dnd) {
+				if (ins && ins._data && ins._data.dnd) {
 					marker.attr('class', 'jstree-' + ins.get_theme() + ( ins.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ));
 					data.helper
-						.children().attr('class', 'jstree-' + ins.get_theme() + ' jstree-' + ins.get_theme() + '-' + ins.get_theme_variant() + ' ' + ( ins.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ))
-						.find('.jstree-copy').first()[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? 'show' : 'hide' ]();
+						.children().attr('class', 'jstree-' + ins.get_theme() + ( ins.settings.core.themes.responsive ? ' jstree-dnd-responsive' : '' ))
+						.find('.jstree-copy:eq(0)')[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? 'show' : 'hide' ]();
 
 
 					// if are hovering the container itself add a new root node
-					if( (data.event.target === ins.element[0] || data.event.target === ins.get_container_ul()[0]) && ins.get_container_ul().children().length === 0) {
+					if ((data.event.target === ins.element[0] || data.event.target === ins.get_container_ul()[0]) && ins.get_container_ul().children().length === 0) {
 						ok = true;
-						for(t1 = 0, t2 = data.data.nodes.length; t1 < t2; t1++) {
-							ok = ok && ins.check( (data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey)) ) ? "copy_node" : "move_node"), (data.data.origin && data.data.origin !== ins ? data.data.origin.get_node(data.data.nodes[t1]) : data.data.nodes[t1]), $.jstree.root, 'last', { 'dnd' : true, 'ref' : ins.get_node($.jstree.root), 'pos' : 'i', 'origin' : data.data.origin, 'is_multi' : (data.data.origin && data.data.origin !== ins), 'is_foreign' : (!data.data.origin) });
-							if(!ok) { break; }
+						for (t1 = 0, t2 = data.data.nodes.length; t1 < t2; t1++) {
+							ok = ok && ins.check((data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey)) ) ? "copy_node" : "move_node"), (data.data.origin && data.data.origin !== ins ? data.data.origin.get_node(data.data.nodes[t1]) : data.data.nodes[t1]), '#', 'last', { 'dnd': true, 'ref': ins.get_node('#'), 'pos': 'i', 'is_multi': (data.data.origin && data.data.origin !== ins), 'is_foreign': (!data.data.origin) });
+							if (!ok) {
+								break;
+							}
 						}
-						if(ok) {
-							lastmv = { 'ins' : ins, 'par' : $.jstree.root, 'pos' : 'last' };
+						if (ok) {
+							lastmv = { 'ins': ins, 'par': '#', 'pos': 'last' };
 							marker.hide();
-							data.helper.find('.jstree-icon').first().removeClass('jstree-er').addClass('jstree-ok');
+							data.helper.find('.jstree-icon:eq(0)').removeClass('jstree-er').addClass('jstree-ok');
 							return;
 						}
 					}
 					else {
 						// if we are hovering a tree node
-						ref = ins.settings.dnd.large_drop_target ? $(data.event.target).closest('.jstree-node').children('.jstree-anchor') : $(data.event.target).closest('.jstree-anchor');
-						if(ref && ref.length && ref.parent().is('.jstree-closed, .jstree-open, .jstree-leaf')) {
+						ref = $(data.event.target).closest('.jstree-anchor');
+						if (ref && ref.length && ref.parent().is('.jstree-closed, .jstree-open, .jstree-leaf')) {
 							off = ref.offset();
 							rel = data.event.pageY - off.top;
-							h = ref.outerHeight();
-							if(rel < h / 3) {
+							h = ref.height();
+							if (rel < h / 3) {
 								o = ['b', 'i', 'a'];
 							}
-							else if(rel > h - h / 3) {
+							else if (rel > h - h / 3) {
 								o = ['a', 'i', 'b'];
 							}
 							else {
 								o = rel > h / 2 ? ['i', 'a', 'b'] : ['i', 'b', 'a'];
 							}
 							$.each(o, function (j, v) {
-								switch(v) {
+								switch (v) {
 									case 'b':
 										l = off.left - 6;
 										t = off.top;
@@ -6332,35 +5877,48 @@
 										i = ref.parent().index() + 1;
 										break;
 								}
+								/*!
+								 // TODO: moving inside, but the node is not yet loaded?
+								 // the check will work anyway, as when moving the node will be loaded first and checked again
+								 if(v === 'i' && !ins.is_loaded(p)) { }
+								 */
 								ok = true;
-								for(t1 = 0, t2 = data.data.nodes.length; t1 < t2; t1++) {
+								for (t1 = 0, t2 = data.data.nodes.length; t1 < t2; t1++) {
 									op = data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? "copy_node" : "move_node";
 									ps = i;
-									if(op === "move_node" && v === 'a' && (data.data.origin && data.data.origin === ins) && p === ins.get_parent(data.data.nodes[t1])) {
+									if (op === "move_node" && v === 'a' && (data.data.origin && data.data.origin === ins) && p === ins.get_parent(data.data.nodes[t1])) {
 										pr = ins.get_node(p);
-										if(ps > $.inArray(data.data.nodes[t1], pr.children)) {
+										if (ps > $.inArray(data.data.nodes[t1], pr.children)) {
 											ps -= 1;
 										}
 									}
-									ok = ok && ( (ins && ins.settings && ins.settings.dnd && ins.settings.dnd.check_while_dragging === false) || ins.check(op, (data.data.origin && data.data.origin !== ins ? data.data.origin.get_node(data.data.nodes[t1]) : data.data.nodes[t1]), p, ps, { 'dnd' : true, 'ref' : ins.get_node(ref.parent()), 'pos' : v, 'origin' : data.data.origin, 'is_multi' : (data.data.origin && data.data.origin !== ins), 'is_foreign' : (!data.data.origin) }) );
-									if(!ok) {
-										if(ins && ins.last_error) { laster = ins.last_error(); }
+									ok = ok && ( (ins && ins.settings && ins.settings.dnd && ins.settings.dnd.check_while_dragging === false) || ins.check(op, (data.data.origin && data.data.origin !== ins ? data.data.origin.get_node(data.data.nodes[t1]) : data.data.nodes[t1]), p, ps, { 'dnd': true, 'ref': ins.get_node(ref.parent()), 'pos': v, 'is_multi': (data.data.origin && data.data.origin !== ins), 'is_foreign': (!data.data.origin) }) );
+									if (!ok) {
+										if (ins && ins.last_error) {
+											laster = ins.last_error();
+										}
 										break;
 									}
 								}
-								if(v === 'i' && ref.parent().is('.jstree-closed') && ins.settings.dnd.open_timeout) {
-									opento = setTimeout((function (x, z) { return function () { x.open_node(z); }; }(ins, ref)), ins.settings.dnd.open_timeout);
-								}
-								if(ok) {
-									lastmv = { 'ins' : ins, 'par' : p, 'pos' : v === 'i' && ip === 'last' && i === 0 && !ins.is_loaded(tm) ? 'last' : i };
-									marker.css({ 'left' : l + 'px', 'top' : t + 'px' }).show();
-									data.helper.find('.jstree-icon').first().removeClass('jstree-er').addClass('jstree-ok');
+								if (ok) {
+									if (v === 'i' && ref.parent().is('.jstree-closed') && ins.settings.dnd.open_timeout) {
+										opento = setTimeout((function (x, z) {
+											return function () {
+												x.open_node(z);
+											};
+										}(ins, ref)), ins.settings.dnd.open_timeout);
+									}
+									lastmv = { 'ins': ins, 'par': p, 'pos': v === 'i' && ip === 'last' && i === 0 && !ins.is_loaded(tm) ? 'last' : i };
+									marker.css({ 'left': l + 'px', 'top': t + 'px' }).show();
+									data.helper.find('.jstree-icon:eq(0)').removeClass('jstree-er').addClass('jstree-ok');
 									laster = {};
 									o = true;
 									return false;
 								}
 							});
-							if(o === true) { return; }
+							if (o === true) {
+								return;
+							}
 						}
 					}
 				}
@@ -6368,71 +5926,63 @@
 				data.helper.find('.jstree-icon').removeClass('jstree-ok').addClass('jstree-er');
 				marker.hide();
 			})
-			.on('dnd_scroll.vakata.jstree', function (e, data) {
-				if(!data || !data.data || !data.data.jstree) { return; }
+			.bind('dnd_scroll.vakata', function (e, data) {
+				if (!data || !data.data || !data.data.jstree) {
+					return;
+				}
 				marker.hide();
 				lastmv = false;
-				lastev = false;
-				data.helper.find('.jstree-icon').first().removeClass('jstree-ok').addClass('jstree-er');
+				data.helper.find('.jstree-icon:eq(0)').removeClass('jstree-ok').addClass('jstree-er');
 			})
-			.on('dnd_stop.vakata.jstree', function (e, data) {
-				if(opento) { clearTimeout(opento); }
-				if(!data || !data.data || !data.data.jstree) { return; }
-				marker.hide().detach();
+			.bind('dnd_stop.vakata', function (e, data) {
+				if (opento) {
+					clearTimeout(opento);
+				}
+				if (!data || !data.data || !data.data.jstree) {
+					return;
+				}
+				marker.hide();
 				var i, j, nodes = [];
-				if(lastmv) {
-					for(i = 0, j = data.data.nodes.length; i < j; i++) {
+				if (lastmv) {
+					for (i = 0, j = data.data.nodes.length; i < j; i++) {
 						nodes[i] = data.data.origin ? data.data.origin.get_node(data.data.nodes[i]) : data.data.nodes[i];
+						if (data.data.origin) {
+							nodes[i].instance = data.data.origin;
+						}
 					}
-					lastmv.ins[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? 'copy_node' : 'move_node' ](nodes, lastmv.par, lastmv.pos, false, false, false, data.data.origin);
+					lastmv.ins[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (data.event.metaKey || data.event.ctrlKey))) ? 'copy_node' : 'move_node' ](nodes, lastmv.par, lastmv.pos);
 				}
 				else {
 					i = $(data.event.target).closest('.jstree');
-					if(i.length && laster && laster.error && laster.error === 'check') {
+					if (i.length && laster && laster.error && laster.error === 'check') {
 						i = i.jstree(true);
-						if(i) {
+						if (i) {
 							i.settings.core.error.call(this, laster);
 						}
 					}
 				}
-				lastev = false;
-				lastmv = false;
 			})
-			.on('keyup.jstree keydown.jstree', function (e, data) {
+			.bind('keyup keydown', function (e, data) {
 				data = $.vakata.dnd._get();
-				if(data && data.data && data.data.jstree) {
-					data.helper.find('.jstree-copy').first()[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (e.metaKey || e.ctrlKey))) ? 'show' : 'hide' ]();
-					if(lastev) {
-						lastev.metaKey = e.metaKey;
-						lastev.ctrlKey = e.ctrlKey;
-						$.vakata.dnd._trigger('move', lastev);
-					}
+				if (data && data.data && data.data.jstree) {
+					data.helper.find('.jstree-copy:eq(0)')[ data.data.origin && (data.data.origin.settings.dnd.always_copy || (data.data.origin.settings.dnd.copy && (e.metaKey || e.ctrlKey))) ? 'show' : 'hide' ]();
 				}
 			});
 	});
 
 	// helpers
 	(function ($) {
-		$.vakata.html = {
-			div : $('<div />'),
-			escape : function (str) {
-				return $.vakata.html.div.text(str).html();
-			},
-			strip : function (str) {
-				return $.vakata.html.div.empty().append($.parseHTML(str)).text();
-			}
-		};
 		// private variable
 		var vakata_dnd = {
-			element	: false,
-			target	: false,
-			is_down	: false,
-			is_drag	: false,
-			helper	: false,
+			element: false,
+			target: false,
+			is_down: false,
+			is_drag: false,
+			helper: false,
 			helper_w: 0,
-			data	: false,
-			init_x	: 0,
-			init_y	: 0,
+			data: false,
+			init_x: 0,
+			init_y: 0,
 			scroll_l: 0,
 			scroll_t: 0,
 			scroll_e: false,
@@ -6440,64 +5990,74 @@
 			is_touch: false
 		};
 		$.vakata.dnd = {
-			settings : {
-				scroll_speed		: 10,
-				scroll_proximity	: 20,
-				helper_left			: 5,
-				helper_top			: 10,
-				threshold			: 5,
-				threshold_touch		: 50
+			settings: {
+				scroll_speed: 10,
+				scroll_proximity: 20,
+				helper_left: 5,
+				helper_top: 10,
+				threshold: 5,
+				threshold_touch: 50
 			},
-			_trigger : function (event_name, e) {
+			_trigger: function (event_name, e) {
 				var data = $.vakata.dnd._get();
 				data.event = e;
 				$(document).triggerHandler("dnd_" + event_name + ".vakata", data);
 			},
-			_get : function () {
+			_get: function () {
 				return {
-					"data"		: vakata_dnd.data,
-					"element"	: vakata_dnd.element,
-					"helper"	: vakata_dnd.helper
+					"data": vakata_dnd.data,
+					"element": vakata_dnd.element,
+					"helper": vakata_dnd.helper
 				};
 			},
-			_clean : function () {
-				if(vakata_dnd.helper) { vakata_dnd.helper.remove(); }
-				if(vakata_dnd.scroll_i) { clearInterval(vakata_dnd.scroll_i); vakata_dnd.scroll_i = false; }
+			_clean: function () {
+				if (vakata_dnd.helper) {
+					vakata_dnd.helper.remove();
+				}
+				if (vakata_dnd.scroll_i) {
+					clearInterval(vakata_dnd.scroll_i);
+					vakata_dnd.scroll_i = false;
+				}
 				vakata_dnd = {
-					element	: false,
-					target	: false,
-					is_down	: false,
-					is_drag	: false,
-					helper	: false,
+					element: false,
+					target: false,
+					is_down: false,
+					is_drag: false,
+					helper: false,
 					helper_w: 0,
-					data	: false,
-					init_x	: 0,
-					init_y	: 0,
+					data: false,
+					init_x: 0,
+					init_y: 0,
 					scroll_l: 0,
 					scroll_t: 0,
 					scroll_e: false,
 					scroll_i: false,
 					is_touch: false
 				};
-				$(document).off("mousemove.vakata.jstree touchmove.vakata.jstree", $.vakata.dnd.drag);
-				$(document).off("mouseup.vakata.jstree touchend.vakata.jstree", $.vakata.dnd.stop);
+				$(document).off("mousemove touchmove", $.vakata.dnd.drag);
+				$(document).off("mouseup touchend", $.vakata.dnd.stop);
 			},
-			_scroll : function (init_only) {
-				if(!vakata_dnd.scroll_e || (!vakata_dnd.scroll_l && !vakata_dnd.scroll_t)) {
-					if(vakata_dnd.scroll_i) { clearInterval(vakata_dnd.scroll_i); vakata_dnd.scroll_i = false; }
+			_scroll: function (init_only) {
+				if (!vakata_dnd.scroll_e || (!vakata_dnd.scroll_l && !vakata_dnd.scroll_t)) {
+					if (vakata_dnd.scroll_i) {
+						clearInterval(vakata_dnd.scroll_i);
+						vakata_dnd.scroll_i = false;
+					}
 					return false;
 				}
-				if(!vakata_dnd.scroll_i) {
+				if (!vakata_dnd.scroll_i) {
 					vakata_dnd.scroll_i = setInterval($.vakata.dnd._scroll, 100);
 					return false;
 				}
-				if(init_only === true) { return false; }
+				if (init_only === true) {
+					return false;
+				}
 
 				var i = vakata_dnd.scroll_e.scrollTop(),
 					j = vakata_dnd.scroll_e.scrollLeft();
 				vakata_dnd.scroll_e.scrollTop(i + vakata_dnd.scroll_t * $.vakata.dnd.settings.scroll_speed);
 				vakata_dnd.scroll_e.scrollLeft(j + vakata_dnd.scroll_l * $.vakata.dnd.settings.scroll_speed);
-				if(i !== vakata_dnd.scroll_e.scrollTop() || j !== vakata_dnd.scroll_e.scrollLeft()) {
+				if (i !== vakata_dnd.scroll_e.scrollTop() || j !== vakata_dnd.scroll_e.scrollLeft()) {
 					/**
 					 * triggered on the document when a drag causes an element to scroll
 					 * @event
@@ -6511,53 +6071,62 @@
 					$.vakata.dnd._trigger("scroll", vakata_dnd.scroll_e);
 				}
 			},
-			start : function (e, data, html) {
-				if(e.type === "touchstart" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
+			start: function (e, data, html) {
+				if (e.type === "touchstart" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
 					e.pageX = e.originalEvent.changedTouches[0].pageX;
 					e.pageY = e.originalEvent.changedTouches[0].pageY;
 					e.target = document.elementFromPoint(e.originalEvent.changedTouches[0].pageX - window.pageXOffset, e.originalEvent.changedTouches[0].pageY - window.pageYOffset);
 				}
-				if(vakata_dnd.is_drag) { $.vakata.dnd.stop({}); }
+				if (vakata_dnd.is_drag) {
+					$.vakata.dnd.stop({});
+				}
 				try {
 					e.currentTarget.unselectable = "on";
-					e.currentTarget.onselectstart = function() { return false; };
-					if(e.currentTarget.style) { e.currentTarget.style.MozUserSelect = "none"; }
-				} catch(ignore) { }
-				vakata_dnd.init_x	= e.pageX;
-				vakata_dnd.init_y	= e.pageY;
-				vakata_dnd.data		= data;
-				vakata_dnd.is_down	= true;
-				vakata_dnd.element	= e.currentTarget;
-				vakata_dnd.target	= e.target;
-				vakata_dnd.is_touch	= e.type === "touchstart";
-				if(html !== false) {
+					e.currentTarget.onselectstart = function () {
+						return false;
+					};
+					if (e.currentTarget.style) {
+						e.currentTarget.style.MozUserSelect = "none";
+					}
+				} catch (ignore) {
+				}
+				vakata_dnd.init_x = e.pageX;
+				vakata_dnd.init_y = e.pageY;
+				vakata_dnd.data = data;
+				vakata_dnd.is_down = true;
+				vakata_dnd.element = e.currentTarget;
+				vakata_dnd.target = e.target;
+				vakata_dnd.is_touch = e.type === "touchstart";
+				if (html !== false) {
 					vakata_dnd.helper = $("<div id='vakata-dnd'></div>").html(html).css({
-						"display"		: "block",
-						"margin"		: "0",
-						"padding"		: "0",
-						"position"		: "absolute",
-						"top"			: "-2000px",
-						"lineHeight"	: "16px",
-						"zIndex"		: "10000"
+						"display": "block",
+						"margin": "0",
+						"padding": "0",
+						"position": "absolute",
+						"top": "-2000px",
+						"lineHeight": "16px",
+						"zIndex": "10000"
 					});
 				}
-				$(document).on("mousemove.vakata.jstree touchmove.vakata.jstree", $.vakata.dnd.drag);
-				$(document).on("mouseup.vakata.jstree touchend.vakata.jstree", $.vakata.dnd.stop);
+				$(document).bind("mousemove touchmove", $.vakata.dnd.drag);
+				$(document).bind("mouseup touchend", $.vakata.dnd.stop);
 				return false;
 			},
-			drag : function (e) {
-				if(e.type === "touchmove" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
+			drag: function (e) {
+				if (e.type === "touchmove" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
 					e.pageX = e.originalEvent.changedTouches[0].pageX;
 					e.pageY = e.originalEvent.changedTouches[0].pageY;
 					e.target = document.elementFromPoint(e.originalEvent.changedTouches[0].pageX - window.pageXOffset, e.originalEvent.changedTouches[0].pageY - window.pageYOffset);
 				}
-				if(!vakata_dnd.is_down) { return; }
-				if(!vakata_dnd.is_drag) {
-					if(
+				if (!vakata_dnd.is_down) {
+					return;
+				}
+				if (!vakata_dnd.is_drag) {
+					if (
 						Math.abs(e.pageX - vakata_dnd.init_x) > (vakata_dnd.is_touch ? $.vakata.dnd.settings.threshold_touch : $.vakata.dnd.settings.threshold) ||
 						Math.abs(e.pageY - vakata_dnd.init_y) > (vakata_dnd.is_touch ? $.vakata.dnd.settings.threshold_touch : $.vakata.dnd.settings.threshold)
 					) {
-						if(vakata_dnd.helper) {
+						if (vakata_dnd.helper) {
 							vakata_dnd.helper.appendTo("body");
 							vakata_dnd.helper_w = vakata_dnd.helper.outerWidth();
 						}
@@ -6574,10 +6143,12 @@
 						 */
 						$.vakata.dnd._trigger("start", e);
 					}
-					else { return; }
+					else {
+						return;
+					}
 				}
 
-				var d  = false, w  = false,
+				var d = false, w = false,
 					dh = false, wh = false,
 					dw = false, ww = false,
 					dt = false, dl = false,
@@ -6588,48 +6159,74 @@
 				vakata_dnd.scroll_e = false;
 				$($(e.target).parentsUntil("body").addBack().get().reverse())
 					.filter(function () {
-						return	(/^auto|scroll$/).test($(this).css("overflow")) &&
-								(this.scrollHeight > this.offsetHeight || this.scrollWidth > this.offsetWidth);
+						return    (/^auto|scroll$/).test($(this).css("overflow")) &&
+							(this.scrollHeight > this.offsetHeight || this.scrollWidth > this.offsetWidth);
 					})
 					.each(function () {
 						var t = $(this), o = t.offset();
-						if(this.scrollHeight > this.offsetHeight) {
-							if(o.top + t.height() - e.pageY < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_t = 1; }
-							if(e.pageY - o.top < $.vakata.dnd.settings.scroll_proximity)				{ vakata_dnd.scroll_t = -1; }
+						if (this.scrollHeight > this.offsetHeight) {
+							if (o.top + t.height() - e.pageY < $.vakata.dnd.settings.scroll_proximity) {
+								vakata_dnd.scroll_t = 1;
+							}
+							if (e.pageY - o.top < $.vakata.dnd.settings.scroll_proximity) {
+								vakata_dnd.scroll_t = -1;
+							}
 						}
-						if(this.scrollWidth > this.offsetWidth) {
-							if(o.left + t.width() - e.pageX < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_l = 1; }
-							if(e.pageX - o.left < $.vakata.dnd.settings.scroll_proximity)				{ vakata_dnd.scroll_l = -1; }
+						if (this.scrollWidth > this.offsetWidth) {
+							if (o.left + t.width() - e.pageX < $.vakata.dnd.settings.scroll_proximity) {
+								vakata_dnd.scroll_l = 1;
+							}
+							if (e.pageX - o.left < $.vakata.dnd.settings.scroll_proximity) {
+								vakata_dnd.scroll_l = -1;
+							}
 						}
-						if(vakata_dnd.scroll_t || vakata_dnd.scroll_l) {
+						if (vakata_dnd.scroll_t || vakata_dnd.scroll_l) {
 							vakata_dnd.scroll_e = $(this);
 							return false;
 						}
 					});
 
-				if(!vakata_dnd.scroll_e) {
-					d  = $(document); w = $(window);
-					dh = d.height(); wh = w.height();
-					dw = d.width(); ww = w.width();
-					dt = d.scrollTop(); dl = d.scrollLeft();
-					if(dh > wh && e.pageY - dt < $.vakata.dnd.settings.scroll_proximity)		{ vakata_dnd.scroll_t = -1;  }
-					if(dh > wh && wh - (e.pageY - dt) < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_t = 1; }
-					if(dw > ww && e.pageX - dl < $.vakata.dnd.settings.scroll_proximity)		{ vakata_dnd.scroll_l = -1; }
-					if(dw > ww && ww - (e.pageX - dl) < $.vakata.dnd.settings.scroll_proximity)	{ vakata_dnd.scroll_l = 1; }
-					if(vakata_dnd.scroll_t || vakata_dnd.scroll_l) {
+				if (!vakata_dnd.scroll_e) {
+					d = $(document);
+					w = $(window);
+					dh = d.height();
+					wh = w.height();
+					dw = d.width();
+					ww = w.width();
+					dt = d.scrollTop();
+					dl = d.scrollLeft();
+					if (dh > wh && e.pageY - dt < $.vakata.dnd.settings.scroll_proximity) {
+						vakata_dnd.scroll_t = -1;
+					}
+					if (dh > wh && wh - (e.pageY - dt) < $.vakata.dnd.settings.scroll_proximity) {
+						vakata_dnd.scroll_t = 1;
+					}
+					if (dw > ww && e.pageX - dl < $.vakata.dnd.settings.scroll_proximity) {
+						vakata_dnd.scroll_l = -1;
+					}
+					if (dw > ww && ww - (e.pageX - dl) < $.vakata.dnd.settings.scroll_proximity) {
+						vakata_dnd.scroll_l = 1;
+					}
+					if (vakata_dnd.scroll_t || vakata_dnd.scroll_l) {
 						vakata_dnd.scroll_e = d;
 					}
 				}
-				if(vakata_dnd.scroll_e) { $.vakata.dnd._scroll(true); }
+				if (vakata_dnd.scroll_e) {
+					$.vakata.dnd._scroll(true);
+				}
 
-				if(vakata_dnd.helper) {
+				if (vakata_dnd.helper) {
 					ht = parseInt(e.pageY + $.vakata.dnd.settings.helper_top, 10);
 					hl = parseInt(e.pageX + $.vakata.dnd.settings.helper_left, 10);
-					if(dh && ht + 25 > dh) { ht = dh - 50; }
-					if(dw && hl + vakata_dnd.helper_w > dw) { hl = dw - (vakata_dnd.helper_w + 2); }
+					if (dh && ht + 25 > dh) {
+						ht = dh - 50;
+					}
+					if (dw && hl + vakata_dnd.helper_w > dw) {
+						hl = dw - (vakata_dnd.helper_w + 2);
+					}
 					vakata_dnd.helper.css({
-						left	: hl + "px",
-						top		: ht + "px"
+						left: hl + "px",
+						top: ht + "px"
 					});
 				}
 				/**
@@ -6645,13 +6242,13 @@
 				$.vakata.dnd._trigger("move", e);
 				return false;
 			},
-			stop : function (e) {
-				if(e.type === "touchend" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
+			stop: function (e) {
+				if (e.type === "touchend" && e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0]) {
 					e.pageX = e.originalEvent.changedTouches[0].pageX;
 					e.pageY = e.originalEvent.changedTouches[0].pageY;
 					e.target = document.elementFromPoint(e.originalEvent.changedTouches[0].pageX - window.pageXOffset, e.originalEvent.changedTouches[0].pageY - window.pageYOffset);
 				}
-				if(vakata_dnd.is_drag) {
+				if (vakata_dnd.is_drag) {
 					/**
 					 * triggered on the document when a drag stops (the dragged element is dropped)
 					 * @event
@@ -6665,9 +6262,15 @@
 					$.vakata.dnd._trigger("stop", e);
 				}
 				else {
-					if(e.type === "touchend" && e.target === vakata_dnd.target) {
-						var to = setTimeout(function () { $(e.target).click(); }, 100);
-						$(e.target).one('click', function() { if(to) { clearTimeout(to); } });
+					if (e.type === "touchend" && e.target === vakata_dnd.target) {
+						var to = setTimeout(function () {
+							$(e.target).click();
+						}, 100);
+						$(e.target).one('click', function () {
+							if (to) {
+								clearTimeout(to);
+							}
+						});
 					}
 				}
 				$.vakata.dnd._clean();
@@ -6680,95 +6283,11 @@
 	// $.jstree.defaults.plugins.push("dnd");
 
 
-/**
- * ### Massload plugin
- *
- * Adds massload functionality to jsTree, so that multiple nodes can be loaded in a single request (only useful with lazy loading).
- */
-
 	/**
-	 * massload configuration
+	 * ### Search plugin
 	 *
-	 * It is possible to set this to a standard jQuery-like AJAX config.
-	 * In addition to the standard jQuery ajax options here you can supply functions for `data` and `url`, the functions will be run in the current instance's scope and a param will be passed indicating which node IDs need to be loaded, the return value of those functions will be used.
-	 *
-	 * You can also set this to a function, that function will receive the node IDs being loaded as argument and a second param which is a function (callback) which should be called with the result.
-	 *
-	 * Both the AJAX and the function approach rely on the same return value - an object where the keys are the node IDs, and the value is the children of that node as an array.
-	 *
-	 *	{
-	 *		"id1" : [{ "text" : "Child of ID1", "id" : "c1" }, { "text" : "Another child of ID1", "id" : "c2" }],
-	 *		"id2" : [{ "text" : "Child of ID2", "id" : "c3" }]
-	 *	}
-	 *
-	 * @name $.jstree.defaults.massload
-	 * @plugin massload
+	 * Adds search functionality to jsTree.
 	 */
-	$.jstree.defaults.massload = null;
-	$.jstree.plugins.massload = function (options, parent) {
-		this.init = function (el, options) {
-			parent.init.call(this, el, options);
-			this._data.massload = {};
-		};
-		this._load_nodes = function (nodes, callback, is_callback) {
-			var s = this.settings.massload;
-			if(is_callback && !$.isEmptyObject(this._data.massload)) {
-				return parent._load_nodes.call(this, nodes, callback, is_callback);
-			}
-			if($.isFunction(s)) {
-				return s.call(this, nodes, $.proxy(function (data) {
-					if(data) {
-						for(var i in data) {
-							if(data.hasOwnProperty(i)) {
-								this._data.massload[i] = data[i];
-							}
-						}
-					}
-					parent._load_nodes.call(this, nodes, callback, is_callback);
-				}, this));
-			}
-			if(typeof s === 'object' && s && s.url) {
-				s = $.extend(true, {}, s);
-				if($.isFunction(s.url)) {
-					s.url = s.url.call(this, nodes);
-				}
-				if($.isFunction(s.data)) {
-					s.data = s.data.call(this, nodes);
-				}
-				return $.ajax(s)
-					.done($.proxy(function (data,t,x) {
-							if(data) {
-								for(var i in data) {
-									if(data.hasOwnProperty(i)) {
-										this._data.massload[i] = data[i];
-									}
-								}
-							}
-							parent._load_nodes.call(this, nodes, callback, is_callback);
-						}, this))
-					.fail($.proxy(function (f) {
-							parent._load_nodes.call(this, nodes, callback, is_callback);
-						}, this));
-			}
-			return parent._load_nodes.call(this, nodes, callback, is_callback);
-		};
-		this._load_node = function (obj, callback) {
-			var d = this._data.massload[obj.id];
-			if(d) {
-				return this[typeof d === 'string' ? '_append_html_data' : '_append_json_data'](obj, typeof d === 'string' ? $($.parseHTML(d)).filter(function () { return this.nodeType !== 3; }) : d, function (status) {
-					callback.call(this, status);
-					delete this._data.massload[obj.id];
-				});
-			}
-			return parent._load_node.call(this, obj, callback);
-		};
-	};
-
-/**
- * ### Search plugin
- *
- * Adds search functionality to jsTree.
- */
 
 	/**
 	 * stores all defaults for the search plugin
@@ -6779,57 +6298,49 @@
 		/**
 		 * a jQuery-like AJAX config, which jstree uses if a server should be queried for results.
 		 *
-		 * A `str` (which is the search string) parameter will be added with the request, an optional `inside` parameter will be added if the search is limited to a node id. The expected result is a JSON array with nodes that need to be opened so that matching nodes will be revealed.
-		 * Leave this setting as `false` to not query the server. You can also set this to a function, which will be invoked in the instance's scope and receive 3 parameters - the search string, the callback to call with the array of nodes to load, and the optional node ID to limit the search to
+		 * A `str` (which is the search string) parameter will be added with the request. The expected result is a JSON array with nodes that need to be opened so that matching nodes will be revealed.
+		 * Leave this setting as `false` to not query the server. You can also set this to a function, which will be invoked in the instance's scope and receive 2 parameters - the search string and the callback to call with the array of nodes to load.
 		 * @name $.jstree.defaults.search.ajax
 		 * @plugin search
 		 */
-		ajax : false,
+		ajax: false,
 		/**
 		 * Indicates if the search should be fuzzy or not (should `chnd3` match `child node 3`). Default is `false`.
 		 * @name $.jstree.defaults.search.fuzzy
 		 * @plugin search
 		 */
-		fuzzy : false,
+		fuzzy: false,
 		/**
 		 * Indicates if the search should be case sensitive. Default is `false`.
 		 * @name $.jstree.defaults.search.case_sensitive
 		 * @plugin search
 		 */
-		case_sensitive : false,
+		case_sensitive: false,
 		/**
-		 * Indicates if the tree should be filtered (by default) to show only matching nodes (keep in mind this can be a heavy on large trees in old browsers).
-		 * This setting can be changed at runtime when calling the search method. Default is `false`.
+		 * Indicates if the tree should be filtered to show only matching nodes (keep in mind this can be a heavy on large trees in old browsers). Default is `false`.
 		 * @name $.jstree.defaults.search.show_only_matches
 		 * @plugin search
 		 */
-		show_only_matches : false,
-		/**
-		 * Indicates if the children of matched element are shown (when show_only_matches is true)
-		 * This setting can be changed at runtime when calling the search method. Default is `false`.
-		 * @name $.jstree.defaults.search.show_only_matches_children
-		 * @plugin search
-		 */
-		show_only_matches_children : false,
+		show_only_matches: false,
 		/**
 		 * Indicates if all nodes opened to reveal the search result, should be closed when the search is cleared or a new search is performed. Default is `true`.
 		 * @name $.jstree.defaults.search.close_opened_onclear
 		 * @plugin search
 		 */
-		close_opened_onclear : true,
+		close_opened_onclear: true,
 		/**
 		 * Indicates if only leaf nodes should be included in search results. Default is `false`.
 		 * @name $.jstree.defaults.search.search_leaves_only
 		 * @plugin search
 		 */
-		search_leaves_only : false,
+		search_leaves_only: false,
 		/**
 		 * If set to a function it wil be called in the instance's scope with two arguments - search string and node (where node will be every node in the structure, so use with caution).
 		 * If the function returns a truthy value the node will be considered a match (it might not be displayed if search_only_leaves is set to true and the node is not a leaf). Default is `false`.
 		 * @name $.jstree.defaults.search.search_callback
 		 * @plugin search
 		 */
-		search_callback : false
+		search_callback: false
 	};
 
 	$.jstree.plugins.search = function (options, parent) {
@@ -6840,124 +6351,129 @@
 			this._data.search.dom = $();
 			this._data.search.res = [];
 			this._data.search.opn = [];
-			this._data.search.som = false;
-			this._data.search.smc = false;
-			this._data.search.hdn = [];
 
-			this.element
-				.on("search.jstree", $.proxy(function (e, data) {
-						if(this._data.search.som && data.res.length) {
-							var m = this._model.data, i, j, p = [];
-							for(i = 0, j = data.res.length; i < j; i++) {
-								if(m[data.res[i]] && !m[data.res[i]].state.hidden) {
-									p.push(data.res[i]);
-									p = p.concat(m[data.res[i]].parents);
-									if(this._data.search.smc) {
-										p = p.concat(m[data.res[i]].children_d);
-									}
-								}
-							}
-							p = $.vakata.array_remove_item($.vakata.array_unique(p), $.jstree.root);
-							this._data.search.hdn = this.hide_all();
-							this.show_node(p);
+			this.element.on('before_open.jstree', $.proxy(function (e, data) {
+				var i, j, f, r = this._data.search.res, s = [], o = $();
+				if (r && r.length) {
+					this._data.search.dom = $(this.element[0].querySelectorAll('#' + $.map(r, function (v) {
+							return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex, '\\$&') : v.replace($.jstree.idregex, '\\$&');
+						}).join(', #')));
+					this._data.search.dom.children(".jstree-anchor").addClass('jstree-search');
+					if (this.settings.search.show_only_matches && this._data.search.res.length) {
+						for (i = 0, j = r.length; i < j; i++) {
+							s = s.concat(this.get_node(r[i]).parents);
 						}
-					}, this))
-				.on("clear_search.jstree", $.proxy(function (e, data) {
-						if(this._data.search.som && data.res.length) {
-							this.show_node(this._data.search.hdn);
+						s = $.vakata.array_remove_item($.vakata.array_unique(s), '#');
+						o = s.length ? $(this.element[0].querySelectorAll('#' + $.map(s, function (v) {
+								return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex, '\\$&') : v.replace($.jstree.idregex, '\\$&');
+							}).join(', #'))) : $();
+
+						this.element.find(".jstree-node").hide().filter('.jstree-last').filter(function () {
+							return this.nextSibling;
+						}).removeClass('jstree-last');
+						o = o.add(this._data.search.dom);
+						o.parentsUntil(".jstree").addBack().show()
+							.filter(".jstree-children").each(function () {
+							$(this).children(".jstree-node:visible").eq(-1).addClass("jstree-last");
+						});
+					}
+				}
+			}, this));
+			if (this.settings.search.show_only_matches) {
+				this.element
+					.on("search.jstree", function (e, data) {
+						if (data.nodes.length) {
+							$(this).find(".jstree-node").hide().filter('.jstree-last').filter(function () {
+								return this.nextSibling;
+							}).removeClass('jstree-last');
+							data.nodes.parentsUntil(".jstree").addBack().show()
+								.filter(".jstree-children").each(function () {
+								$(this).children(".jstree-node:visible").eq(-1).addClass("jstree-last");
+							});
 						}
-					}, this));
+					})
+					.on("clear_search.jstree", function (e, data) {
+						if (data.nodes.length) {
+							$(this).find(".jstree-node").css("display", "").filter('.jstree-last').filter(function () {
+								return this.nextSibling;
+							}).removeClass('jstree-last');
+						}
+					});
+			}
 		};
 		/**
 		 * used to search the tree nodes for a given string
 		 * @name search(str [, skip_async])
 		 * @param {String} str the search string
 		 * @param {Boolean} skip_async if set to true server will not be queried even if configured
-		 * @param {Boolean} show_only_matches if set to true only matching nodes will be shown (keep in mind this can be very slow on large trees or old browsers)
-		 * @param {mixed} inside an optional node to whose children to limit the search
-		 * @param {Boolean} append if set to true the results of this search are appended to the previous search
 		 * @plugin search
 		 * @trigger search.jstree
 		 */
-		this.search = function (str, skip_async, show_only_matches, inside, append, show_only_matches_children) {
-			if(str === false || $.trim(str.toString()) === "") {
+		this.search = function (str, skip_async) {
+			if (str === false || $.trim(str.toString()) === "") {
 				return this.clear_search();
 			}
-			inside = this.get_node(inside);
-			inside = inside && inside.id ? inside.id : null;
 			str = str.toString();
 			var s = this.settings.search,
 				a = s.ajax ? s.ajax : false,
-				m = this._model.data,
 				f = null,
 				r = [],
 				p = [], i, j;
-			if(this._data.search.res.length && !append) {
+			if (this._data.search.res.length) {
 				this.clear_search();
 			}
-			if(show_only_matches === undefined) {
-				show_only_matches = s.show_only_matches;
-			}
-			if(show_only_matches_children === undefined) {
-				show_only_matches_children = s.show_only_matches_children;
-			}
-			if(!skip_async && a !== false) {
-				if($.isFunction(a)) {
+			if (!skip_async && a !== false) {
+				if ($.isFunction(a)) {
 					return a.call(this, str, $.proxy(function (d) {
-							if(d && d.d) { d = d.d; }
-							this._load_nodes(!$.isArray(d) ? [] : $.vakata.array_unique(d), function () {
-								this.search(str, true, show_only_matches, inside, append);
-							}, true);
-						}, this), inside);
+						if (d && d.d) {
+							d = d.d;
+						}
+						this._load_nodes(!$.isArray(d) ? [] : $.vakata.array_unique(d), function () {
+							this.search(str, true);
+						}, true);
+					}, this));
 				}
 				else {
 					a = $.extend({}, a);
-					if(!a.data) { a.data = {}; }
-					a.data.str = str;
-					if(inside) {
-						a.data.inside = inside;
+					if (!a.data) {
+						a.data = {};
 					}
+					a.data.str = str;
 					return $.ajax(a)
 						.fail($.proxy(function () {
-							this._data.core.last_error = { 'error' : 'ajax', 'plugin' : 'search', 'id' : 'search_01', 'reason' : 'Could not load search parents', 'data' : JSON.stringify(a) };
+							this._data.core.last_error = { 'error': 'ajax', 'plugin': 'search', 'id': 'search_01', 'reason': 'Could not load search parents', 'data': JSON.stringify(a) };
 							this.settings.core.error.call(this, this._data.core.last_error);
 						}, this))
 						.done($.proxy(function (d) {
-							if(d && d.d) { d = d.d; }
+							if (d && d.d) {
+								d = d.d;
+							}
 							this._load_nodes(!$.isArray(d) ? [] : $.vakata.array_unique(d), function () {
-								this.search(str, true, show_only_matches, inside, append);
+								this.search(str, true);
 							}, true);
 						}, this));
 				}
 			}
-			if(!append) {
-				this._data.search.str = str;
-				this._data.search.dom = $();
-				this._data.search.res = [];
-				this._data.search.opn = [];
-				this._data.search.som = show_only_matches;
-				this._data.search.smc = show_only_matches_children;
-			}
+			this._data.search.str = str;
+			this._data.search.dom = $();
+			this._data.search.res = [];
+			this._data.search.opn = [];
 
-			f = new $.vakata.search(str, true, { caseSensitive : s.case_sensitive, fuzzy : s.fuzzy });
-			$.each(m[inside ? inside : $.jstree.root].children_d, function (ii, i) {
-				var v = m[i];
-				if(v.text && (!s.search_leaves_only || (v.state.loaded && v.children.length === 0)) && ( (s.search_callback && s.search_callback.call(this, str, v)) || (!s.search_callback && f.search(v.text).isMatch) ) ) {
+			f = new $.vakata.search(str, true, { caseSensitive: s.case_sensitive, fuzzy: s.fuzzy });
+
+			$.each(this._model.data, function (i, v) {
+				if (v.text && ( (s.search_callback && s.search_callback.call(this, str, v)) || (!s.search_callback && f.search(v.text).isMatch) ) && (!s.search_leaves_only || (v.state.loaded && v.children.length === 0))) {
 					r.push(i);
 					p = p.concat(v.parents);
 				}
 			});
-			if(r.length) {
+			if (r.length) {
 				p = $.vakata.array_unique(p);
 				this._search_open(p);
-				if(!append) {
-					this._data.search.dom = $(this.element[0].querySelectorAll('#' + $.map(r, function (v) { return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&'); }).join(', #')));
-					this._data.search.res = r;
-				}
-				else {
-					this._data.search.dom = this._data.search.dom.add($(this.element[0].querySelectorAll('#' + $.map(r, function (v) { return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&'); }).join(', #'))));
-					this._data.search.res = $.vakata.array_unique(this._data.search.res.concat(r));
-				}
+				this._data.search.dom = $(this.element[0].querySelectorAll('#' + $.map(r, function (v) {
+						return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex, '\\$&') : v.replace($.jstree.idregex, '\\$&');
+					}).join(', #')));
+				this._data.search.res = r;
 				this._data.search.dom.children(".jstree-anchor").addClass('jstree-search');
 			}
 			/**
@@ -6969,7 +6485,7 @@
 			 * @param {Array} res a collection of objects represeing the matching nodes
 			 * @plugin search
 			 */
-			this.trigger('search', { nodes : this._data.search.dom, str : str, res : this._data.search.res, show_only_matches : show_only_matches });
+			this.trigger('search', { nodes: this._data.search.dom, str: str, res: this._data.search.res });
 		};
 		/**
 		 * used to clear the last search (removes classes and shows all nodes if filtering is on)
@@ -6978,7 +6494,8 @@
 		 * @trigger clear_search.jstree
 		 */
 		this.clear_search = function () {
-			if(this.settings.search.close_opened_onclear) {
+			this._data.search.dom.children(".jstree-anchor").removeClass("jstree-search");
+			if (this.settings.search.close_opened_onclear) {
 				this.close_node(this._data.search.opn, 0);
 			}
 			/**
@@ -6990,13 +6507,7 @@
 			 * @param {Array} res a collection of objects represeing the matching nodes (the result from the last search)
 			 * @plugin search
 			 */
-			this.trigger('clear_search', { 'nodes' : this._data.search.dom, str : this._data.search.str, res : this._data.search.res });
-			if(this._data.search.res.length) {
-				this._data.search.dom = $(this.element[0].querySelectorAll('#' + $.map(this._data.search.res, function (v) {
-					return "0123456789".indexOf(v[0]) !== -1 ? '\\3' + v[0] + ' ' + v.substr(1).replace($.jstree.idregex,'\\$&') : v.replace($.jstree.idregex,'\\$&');
-				}).join(', #')));
-				this._data.search.dom.children(".jstree-anchor").removeClass("jstree-search");
-			}
+			this.trigger('clear_search', { 'nodes': this._data.search.dom, str: this._data.search.str, res: this._data.search.res });
 			this._data.search.str = "";
 			this._data.search.res = [];
 			this._data.search.opn = [];
@@ -7012,56 +6523,43 @@
 		this._search_open = function (d) {
 			var t = this;
 			$.each(d.concat([]), function (i, v) {
-				if(v === $.jstree.root) { return true; }
-				try { v = $('#' + v.replace($.jstree.idregex,'\\$&'), t.element); } catch(ignore) { }
-				if(v && v.length) {
-					if(t.is_closed(v)) {
+				if (v === "#") {
+					return true;
+				}
+				try {
+					v = $('#' + v.replace($.jstree.idregex, '\\$&'), t.element);
+				} catch (ignore) {
+				}
+				if (v && v.length) {
+					if (t.is_closed(v)) {
 						t._data.search.opn.push(v[0].id);
-						t.open_node(v, function () { t._search_open(d); }, 0);
+						t.open_node(v, function () {
+							t._search_open(d);
+						}, 0);
 					}
 				}
 			});
 		};
-
-		this.redraw_node = function(obj, deep, callback, force_render) {
-			obj = parent.redraw_node.apply(this, arguments);
-			if(obj) {
-				if($.inArray(obj.id, this._data.search.res) !== -1) {
-					var i, j, tmp = null;
-					for(i = 0, j = obj.childNodes.length; i < j; i++) {
-						if(obj.childNodes[i] && obj.childNodes[i].className && obj.childNodes[i].className.indexOf("jstree-anchor") !== -1) {
-							tmp = obj.childNodes[i];
-							break;
-						}
-					}
-					if(tmp) {
-						tmp.className += ' jstree-search';
-					}
-				}
-			}
-			return obj;
-		};
 	};
 
 	// helpers
 	(function ($) {
 		// from http://kiro.me/projects/fuse.html
-		$.vakata.search = function(pattern, txt, options) {
+		$.vakata.search = function (pattern, txt, options) {
 			options = options || {};
-			options = $.extend({}, $.vakata.search.defaults, options);
-			if(options.fuzzy !== false) {
+			if (options.fuzzy !== false) {
 				options.fuzzy = true;
 			}
 			pattern = options.caseSensitive ? pattern : pattern.toLowerCase();
-			var MATCH_LOCATION	= options.location,
-				MATCH_DISTANCE	= options.distance,
-				MATCH_THRESHOLD	= options.threshold,
+			var MATCH_LOCATION = options.location || 0,
+				MATCH_DISTANCE = options.distance || 100,
+				MATCH_THRESHOLD = options.threshold || 0.6,
 				patternLen = pattern.length,
 				matchmask, pattern_alphabet, match_bitapScore, search;
-			if(patternLen > 32) {
+			if (patternLen > 32) {
 				options.fuzzy = false;
 			}
-			if(options.fuzzy) {
+			if (options.fuzzy) {
 				matchmask = 1 << (patternLen - 1);
 				pattern_alphabet = (function () {
 					var mask = {},
@@ -7077,7 +6575,7 @@
 				match_bitapScore = function (e, x) {
 					var accuracy = e / patternLen,
 						proximity = Math.abs(MATCH_LOCATION - x);
-					if(!MATCH_DISTANCE) {
+					if (!MATCH_DISTANCE) {
 						return proximity ? 1.0 : accuracy;
 					}
 					return accuracy + (proximity / MATCH_DISTANCE);
@@ -7085,13 +6583,13 @@
 			}
 			search = function (text) {
 				text = options.caseSensitive ? text : text.toLowerCase();
-				if(pattern === text || text.indexOf(pattern) !== -1) {
+				if (pattern === text || text.indexOf(pattern) !== -1) {
 					return {
 						isMatch: true,
 						score: 0
 					};
 				}
-				if(!options.fuzzy) {
+				if (!options.fuzzy) {
 					return {
 						isMatch: false,
 						score: 1
@@ -7161,26 +6659,18 @@
 					score: score
 				};
 			};
-			return txt === true ? { 'search' : search } : search(txt);
-		};
-		$.vakata.search.defaults = {
-			location : 0,
-			distance : 100,
-			threshold : 0.6,
-			fuzzy : false,
-			caseSensitive : false
+			return txt === true ? { 'search': search } : search(txt);
 		};
 	}($));
 
 	// include the search plugin by default
 	// $.jstree.defaults.plugins.push("search");
 
-
-/**
- * ### Sort plugin
- *
- * Automatically sorts all siblings in the tree according to a sorting function.
- */
+	/**
+	 * ### Sort plugin
+	 *
+	 * Autmatically sorts all siblings in the tree according to a sorting function.
+	 */
 
 	/**
 	 * the settings function used to sort the nodes.
@@ -7197,16 +6687,16 @@
 			parent.bind.call(this);
 			this.element
 				.on("model.jstree", $.proxy(function (e, data) {
-						this.sort(data.parent, true);
-					}, this))
+					this.sort(data.parent, true);
+				}, this))
 				.on("rename_node.jstree create_node.jstree", $.proxy(function (e, data) {
-						this.sort(data.parent || data.node.parent, false);
-						this.redraw_node(data.parent || data.node.parent, true);
-					}, this))
+					this.sort(data.parent || data.node.parent, false);
+					this.redraw_node(data.parent || data.node.parent, true);
+				}, this))
 				.on("move_node.jstree copy_node.jstree", $.proxy(function (e, data) {
-						this.sort(data.parent, false);
-						this.redraw_node(data.parent, true);
-					}, this));
+					this.sort(data.parent, false);
+					this.redraw_node(data.parent, true);
+				}, this));
 		};
 		/**
 		 * used to sort a node's children
@@ -7220,10 +6710,10 @@
 		this.sort = function (obj, deep) {
 			var i, j;
 			obj = this.get_node(obj);
-			if(obj && obj.children && obj.children.length) {
+			if (obj && obj.children && obj.children.length) {
 				obj.children.sort($.proxy(this.settings.sort, this));
-				if(deep) {
-					for(i = 0, j = obj.children_d.length; i < j; i++) {
+				if (deep) {
+					for (i = 0, j = obj.children_d.length; i < j; i++) {
 						this.sort(obj.children_d[i], false);
 					}
 				}
@@ -7234,11 +6724,11 @@
 	// include the sort plugin by default
 	// $.jstree.defaults.plugins.push("sort");
 
-/**
- * ### State plugin
- *
- * Saves the state of the tree (selected nodes, opened nodes) on the user's computer using available options (localStorage, cookies, etc)
- */
+	/**
+	 * ### State plugin
+	 *
+	 * Saves the state of the tree (selected nodes, opened nodes) on the user's computer using available options (localStorage, cookies, etc)
+	 */
 
 	var to = false;
 	/**
@@ -7252,47 +6742,46 @@
 		 * @name $.jstree.defaults.state.key
 		 * @plugin state
 		 */
-		key		: 'jstree',
+		key: 'jstree',
 		/**
 		 * A space separated list of events that trigger a state save. Defaults to `changed.jstree open_node.jstree close_node.jstree`.
 		 * @name $.jstree.defaults.state.events
 		 * @plugin state
 		 */
-		events	: 'changed.jstree open_node.jstree close_node.jstree check_node.jstree uncheck_node.jstree',
+		events: 'changed.jstree open_node.jstree close_node.jstree',
 		/**
 		 * Time in milliseconds after which the state will expire. Defaults to 'false' meaning - no expire.
 		 * @name $.jstree.defaults.state.ttl
 		 * @plugin state
 		 */
-		ttl		: false,
+		ttl: false,
 		/**
 		 * A function that will be executed prior to restoring state with one argument - the state object. Can be used to clear unwanted parts of the state.
 		 * @name $.jstree.defaults.state.filter
 		 * @plugin state
 		 */
-		filter	: false
+		filter: false
 	};
 	$.jstree.plugins.state = function (options, parent) {
 		this.bind = function () {
 			parent.bind.call(this);
 			var bind = $.proxy(function () {
 				this.element.on(this.settings.state.events, $.proxy(function () {
-					if(to) { clearTimeout(to); }
-					to = setTimeout($.proxy(function () { this.save_state(); }, this), 100);
+					if (to) {
+						clearTimeout(to);
+					}
+					to = setTimeout($.proxy(function () {
+						this.save_state();
+					}, this), 100);
 				}, this));
-				/**
-				 * triggered when the state plugin is finished restoring the state (and immediately after ready if there is no state to restore).
-				 * @event
-				 * @name state_ready.jstree
-				 * @plugin state
-				 */
-				this.trigger('state_ready');
 			}, this);
 			this.element
 				.on("ready.jstree", $.proxy(function (e, data) {
-						this.element.one("restore_state.jstree", bind);
-						if(!this.restore_state()) { bind(); }
-					}, this));
+					this.element.one("restore_state.jstree", bind);
+					if (!this.restore_state()) {
+						bind();
+					}
+				}, this));
 		};
 		/**
 		 * save the state
@@ -7300,7 +6789,7 @@
 		 * @plugin state
 		 */
 		this.save_state = function () {
-			var st = { 'state' : this.get_state(), 'ttl' : this.settings.state.ttl, 'sec' : +(new Date()) };
+			var st = { 'state': this.get_state(), 'ttl': this.settings.state.ttl, 'sec': +(new Date()) };
 			$.vakata.storage.set(this.settings.state.key, JSON.stringify(st));
 		};
 		/**
@@ -7310,12 +6799,26 @@
 		 */
 		this.restore_state = function () {
 			var k = $.vakata.storage.get(this.settings.state.key);
-			if(!!k) { try { k = JSON.parse(k); } catch(ex) { return false; } }
-			if(!!k && k.ttl && k.sec && +(new Date()) - k.sec > k.ttl) { return false; }
-			if(!!k && k.state) { k = k.state; }
-			if(!!k && $.isFunction(this.settings.state.filter)) { k = this.settings.state.filter.call(this, k); }
-			if(!!k) {
-				this.element.one("set_state.jstree", function (e, data) { data.instance.trigger('restore_state', { 'state' : $.extend(true, {}, k) }); });
+			if (!!k) {
+				try {
+					k = JSON.parse(k);
+				} catch (ex) {
+					return false;
+				}
+			}
+			if (!!k && k.ttl && k.sec && +(new Date()) - k.sec > k.ttl) {
+				return false;
+			}
+			if (!!k && k.state) {
+				k = k.state;
+			}
+			if (!!k && $.isFunction(this.settings.state.filter)) {
+				k = this.settings.state.filter.call(this, k);
+			}
+			if (!!k) {
+				this.element.one("set_state.jstree", function (e, data) {
+					data.instance.trigger('restore_state', { 'state': $.extend(true, {}, k) });
+				});
 				this.set_state(k);
 				return true;
 			}
@@ -7334,20 +6837,26 @@
 	(function ($, undefined) {
 		$.vakata.storage = {
 			// simply specifying the functions in FF throws an error
-			set : function (key, val) { return window.localStorage.setItem(key, val); },
-			get : function (key) { return window.localStorage.getItem(key); },
-			del : function (key) { return window.localStorage.removeItem(key); }
+			set: function (key, val) {
+				return window.localStorage.setItem(key, val);
+			},
+			get: function (key) {
+				return window.localStorage.getItem(key);
+			},
+			del: function (key) {
+				return window.localStorage.removeItem(key);
+			}
 		};
 	}($));
 
 	// include the state plugin by default
 	// $.jstree.defaults.plugins.push("state");
 
-/**
- * ### Types plugin
- *
- * Makes it possible to add predefined types for groups of nodes, which make it possible to easily control nesting rules and icon for each group.
- */
+	/**
+	 * ### Types plugin
+	 *
+	 * Makes it possible to add predefined types for groups of nodes, which make it possible to easily control nesting rules and icon for each group.
+	 */
 
 	/**
 	 * An object storing all types as key value pairs, where the key is the type name and the value is an object that could contain following keys (all optional).
@@ -7366,18 +6875,18 @@
 	 * @plugin types
 	 */
 	$.jstree.defaults.types = {
-		'default' : {}
+		'#': {},
+		'default': {}
 	};
-	$.jstree.defaults.types[$.jstree.root] = {};
 
 	$.jstree.plugins.types = function (options, parent) {
 		this.init = function (el, options) {
 			var i, j;
-			if(options && options.types && options.types['default']) {
-				for(i in options.types) {
-					if(i !== "default" && i !== $.jstree.root && options.types.hasOwnProperty(i)) {
-						for(j in options.types['default']) {
-							if(options.types['default'].hasOwnProperty(j) && options.types[i][j] === undefined) {
+			if (options && options.types && options.types['default']) {
+				for (i in options.types) {
+					if (i !== "default" && i !== "#" && options.types.hasOwnProperty(i)) {
+						for (j in options.types['default']) {
+							if (options.types['default'].hasOwnProperty(j) && options.types[i][j] === undefined) {
 								options.types[i][j] = options.types['default'][j];
 							}
 						}
@@ -7385,120 +6894,120 @@
 				}
 			}
 			parent.init.call(this, el, options);
-			this._model.data[$.jstree.root].type = $.jstree.root;
+			this._model.data['#'].type = '#';
 		};
 		this.refresh = function (skip_loading, forget_state) {
 			parent.refresh.call(this, skip_loading, forget_state);
-			this._model.data[$.jstree.root].type = $.jstree.root;
+			this._model.data['#'].type = '#';
 		};
 		this.bind = function () {
 			this.element
 				.on('model.jstree', $.proxy(function (e, data) {
-						var m = this._model.data,
-							dpc = data.nodes,
-							t = this.settings.types,
-							i, j, c = 'default';
-						for(i = 0, j = dpc.length; i < j; i++) {
-							c = 'default';
-							if(m[dpc[i]].original && m[dpc[i]].original.type && t[m[dpc[i]].original.type]) {
-								c = m[dpc[i]].original.type;
-							}
-							if(m[dpc[i]].data && m[dpc[i]].data.jstree && m[dpc[i]].data.jstree.type && t[m[dpc[i]].data.jstree.type]) {
-								c = m[dpc[i]].data.jstree.type;
-							}
-							m[dpc[i]].type = c;
-							if(m[dpc[i]].icon === true && t[c].icon !== undefined) {
-								m[dpc[i]].icon = t[c].icon;
-							}
+					var m = this._model.data,
+						dpc = data.nodes,
+						t = this.settings.types,
+						i, j, c = 'default';
+					for (i = 0, j = dpc.length; i < j; i++) {
+						c = 'default';
+						if (m[dpc[i]].original && m[dpc[i]].original.type && t[m[dpc[i]].original.type]) {
+							c = m[dpc[i]].original.type;
 						}
-						m[$.jstree.root].type = $.jstree.root;
-					}, this));
+						if (m[dpc[i]].data && m[dpc[i]].data.jstree && m[dpc[i]].data.jstree.type && t[m[dpc[i]].data.jstree.type]) {
+							c = m[dpc[i]].data.jstree.type;
+						}
+						m[dpc[i]].type = c;
+						if (m[dpc[i]].icon === true && t[c].icon !== undefined) {
+							m[dpc[i]].icon = t[c].icon;
+						}
+					}
+					m['#'].type = '#';
+				}, this));
 			parent.bind.call(this);
 		};
 		this.get_json = function (obj, options, flat) {
 			var i, j,
 				m = this._model.data,
-				opt = options ? $.extend(true, {}, options, {no_id:false}) : {},
+				opt = options ? $.extend(true, {}, options, {no_id: false}) : {},
 				tmp = parent.get_json.call(this, obj, opt, flat);
-			if(tmp === false) { return false; }
-			if($.isArray(tmp)) {
-				for(i = 0, j = tmp.length; i < j; i++) {
+			if (tmp === false) {
+				return false;
+			}
+			if ($.isArray(tmp)) {
+				for (i = 0, j = tmp.length; i < j; i++) {
 					tmp[i].type = tmp[i].id && m[tmp[i].id] && m[tmp[i].id].type ? m[tmp[i].id].type : "default";
-					if(options && options.no_id) {
+					if (options && options.no_id) {
 						delete tmp[i].id;
-						if(tmp[i].li_attr && tmp[i].li_attr.id) {
+						if (tmp[i].li_attr && tmp[i].li_attr.id) {
 							delete tmp[i].li_attr.id;
 						}
-						if(tmp[i].a_attr && tmp[i].a_attr.id) {
-							delete tmp[i].a_attr.id;
-						}
 					}
 				}
 			}
 			else {
 				tmp.type = tmp.id && m[tmp.id] && m[tmp.id].type ? m[tmp.id].type : "default";
-				if(options && options.no_id) {
+				if (options && options.no_id) {
 					tmp = this._delete_ids(tmp);
 				}
 			}
 			return tmp;
 		};
 		this._delete_ids = function (tmp) {
-			if($.isArray(tmp)) {
-				for(var i = 0, j = tmp.length; i < j; i++) {
+			if ($.isArray(tmp)) {
+				for (var i = 0, j = tmp.length; i < j; i++) {
 					tmp[i] = this._delete_ids(tmp[i]);
 				}
 				return tmp;
 			}
 			delete tmp.id;
-			if(tmp.li_attr && tmp.li_attr.id) {
+			if (tmp.li_attr && tmp.li_attr.id) {
 				delete tmp.li_attr.id;
 			}
-			if(tmp.a_attr && tmp.a_attr.id) {
-				delete tmp.a_attr.id;
-			}
-			if(tmp.children && $.isArray(tmp.children)) {
+			if (tmp.children && $.isArray(tmp.children)) {
 				tmp.children = this._delete_ids(tmp.children);
 			}
 			return tmp;
 		};
 		this.check = function (chk, obj, par, pos, more) {
-			if(parent.check.call(this, chk, obj, par, pos, more) === false) { return false; }
+			if (parent.check.call(this, chk, obj, par, pos, more) === false) {
+				return false;
+			}
 			obj = obj && obj.id ? obj : this.get_node(obj);
 			par = par && par.id ? par : this.get_node(par);
-			var m = obj && obj.id ? (more && more.origin ? more.origin : $.jstree.reference(obj.id)) : null, tmp, d, i, j;
+			var m = obj && obj.id ? $.jstree.reference(obj.id) : null, tmp, d, i, j;
 			m = m && m._model && m._model.data ? m._model.data : null;
-			switch(chk) {
+			switch (chk) {
 				case "create_node":
 				case "move_node":
 				case "copy_node":
-					if(chk !== 'move_node' || $.inArray(obj.id, par.children) === -1) {
+					if (chk !== 'move_node' || $.inArray(obj.id, par.children) === -1) {
 						tmp = this.get_rules(par);
-						if(tmp.max_children !== undefined && tmp.max_children !== -1 && tmp.max_children === par.children.length) {
-							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_01', 'reason' : 'max_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+						if (tmp.max_children !== undefined && tmp.max_children !== -1 && tmp.max_children === par.children.length) {
+							this._data.core.last_error = { 'error': 'check', 'plugin': 'types', 'id': 'types_01', 'reason': 'max_children prevents function: ' + chk, 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 							return false;
 						}
-						if(tmp.valid_children !== undefined && tmp.valid_children !== -1 && $.inArray((obj.type || 'default'), tmp.valid_children) === -1) {
-							this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_02', 'reason' : 'valid_children prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+						if (tmp.valid_children !== undefined && tmp.valid_children !== -1 && $.inArray(obj.type, tmp.valid_children) === -1) {
+							this._data.core.last_error = { 'error': 'check', 'plugin': 'types', 'id': 'types_02', 'reason': 'valid_children prevents function: ' + chk, 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 							return false;
 						}
-						if(m && obj.children_d && obj.parents) {
+						if (m && obj.children_d && obj.parents) {
 							d = 0;
-							for(i = 0, j = obj.children_d.length; i < j; i++) {
+							for (i = 0, j = obj.children_d.length; i < j; i++) {
 								d = Math.max(d, m[obj.children_d[i]].parents.length);
 							}
 							d = d - obj.parents.length + 1;
 						}
-						if(d <= 0 || d === undefined) { d = 1; }
+						if (d <= 0 || d === undefined) {
+							d = 1;
+						}
 						do {
-							if(tmp.max_depth !== undefined && tmp.max_depth !== -1 && tmp.max_depth < d) {
-								this._data.core.last_error = { 'error' : 'check', 'plugin' : 'types', 'id' : 'types_03', 'reason' : 'max_depth prevents function: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+							if (tmp.max_depth !== undefined && tmp.max_depth !== -1 && tmp.max_depth < d) {
+								this._data.core.last_error = { 'error': 'check', 'plugin': 'types', 'id': 'types_03', 'reason': 'max_depth prevents function: ' + chk, 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 								return false;
 							}
 							par = this.get_node(par.parent);
 							tmp = this.get_rules(par);
 							d++;
-						} while(par);
+						} while (par);
 					}
 					break;
 			}
@@ -7513,11 +7022,19 @@
 		 */
 		this.get_rules = function (obj) {
 			obj = this.get_node(obj);
-			if(!obj) { return false; }
+			if (!obj) {
+				return false;
+			}
 			var tmp = this.get_type(obj, true);
-			if(tmp.max_depth === undefined) { tmp.max_depth = -1; }
-			if(tmp.max_children === undefined) { tmp.max_children = -1; }
-			if(tmp.valid_children === undefined) { tmp.valid_children = -1; }
+			if (tmp.max_depth === undefined) {
+				tmp.max_depth = -1;
+			}
+			if (tmp.max_children === undefined) {
+				tmp.max_children = -1;
+			}
+			if (tmp.valid_children === undefined) {
+				tmp.valid_children = -1;
+			}
 			return tmp;
 		};
 		/**
@@ -7530,7 +7047,7 @@
 		 */
 		this.get_type = function (obj, rules) {
 			obj = this.get_node(obj);
-			return (!obj) ? false : ( rules ? $.extend({ 'type' : obj.type }, this.settings.types[obj.type]) : obj.type);
+			return (!obj) ? false : ( rules ? $.extend({ 'type': obj.type }, this.settings.types[obj.type]) : obj.type);
 		};
 		/**
 		 * used to change a node's type
@@ -7541,20 +7058,22 @@
 		 */
 		this.set_type = function (obj, type) {
 			var t, t1, t2, old_type, old_icon;
-			if($.isArray(obj)) {
+			if ($.isArray(obj)) {
 				obj = obj.slice();
-				for(t1 = 0, t2 = obj.length; t1 < t2; t1++) {
+				for (t1 = 0, t2 = obj.length; t1 < t2; t1++) {
 					this.set_type(obj[t1], type);
 				}
 				return true;
 			}
 			t = this.settings.types;
 			obj = this.get_node(obj);
-			if(!t[type] || !obj) { return false; }
+			if (!t[type] || !obj) {
+				return false;
+			}
 			old_type = obj.type;
 			old_icon = this.get_icon(obj);
 			obj.type = type;
-			if(old_icon === true || (t[old_type] && t[old_type].icon !== undefined && old_icon === t[old_type].icon)) {
+			if (old_icon === true || (t[old_type] && t[old_type].icon && old_icon === t[old_type].icon)) {
 				this.set_icon(obj, t[type].icon !== undefined ? t[type].icon : true);
 			}
 			return true;
@@ -7563,11 +7082,11 @@
 	// include the types plugin by default
 	// $.jstree.defaults.plugins.push("types");
 
-/**
- * ### Unique plugin
- *
- * Enforces that no nodes with the same name can coexist as siblings.
- */
+	/**
+	 * ### Unique plugin
+	 *
+	 * Enforces that no nodes with the same name can coexist as siblings.
+	 */
 
 	/**
 	 * stores all defaults for the unique plugin
@@ -7580,83 +7099,91 @@
 		 * @name $.jstree.defaults.unique.case_sensitive
 		 * @plugin unique
 		 */
-		case_sensitive : false,
+		case_sensitive: false,
 		/**
 		 * A callback executed in the instance's scope when a new node is created and the name is already taken, the two arguments are the conflicting name and the counter. The default will produce results like `New node (2)`.
 		 * @name $.jstree.defaults.unique.duplicate
 		 * @plugin unique
 		 */
-		duplicate : function (name, counter) {
+		duplicate: function (name, counter) {
 			return name + ' (' + counter + ')';
 		}
 	};
 
 	$.jstree.plugins.unique = function (options, parent) {
 		this.check = function (chk, obj, par, pos, more) {
-			if(parent.check.call(this, chk, obj, par, pos, more) === false) { return false; }
+			if (parent.check.call(this, chk, obj, par, pos, more) === false) {
+				return false;
+			}
 			obj = obj && obj.id ? obj : this.get_node(obj);
 			par = par && par.id ? par : this.get_node(par);
-			if(!par || !par.children) { return true; }
+			if (!par || !par.children) {
+				return true;
+			}
 			var n = chk === "rename_node" ? pos : obj.text,
 				c = [],
 				s = this.settings.unique.case_sensitive,
 				m = this._model.data, i, j;
-			for(i = 0, j = par.children.length; i < j; i++) {
+			for (i = 0, j = par.children.length; i < j; i++) {
 				c.push(s ? m[par.children[i]].text : m[par.children[i]].text.toLowerCase());
 			}
-			if(!s) { n = n.toLowerCase(); }
-			switch(chk) {
+			if (!s) {
+				n = n.toLowerCase();
+			}
+			switch (chk) {
 				case "delete_node":
 					return true;
 				case "rename_node":
 					i = ($.inArray(n, c) === -1 || (obj.text && obj.text[ s ? 'toString' : 'toLowerCase']() === n));
-					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_01', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					if (!i) {
+						this._data.core.last_error = { 'error': 'check', 'plugin': 'unique', 'id': 'unique_01', 'reason': 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 					}
 					return i;
 				case "create_node":
 					i = ($.inArray(n, c) === -1);
-					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_04', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					if (!i) {
+						this._data.core.last_error = { 'error': 'check', 'plugin': 'unique', 'id': 'unique_04', 'reason': 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 					}
 					return i;
 				case "copy_node":
 					i = ($.inArray(n, c) === -1);
-					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_02', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					if (!i) {
+						this._data.core.last_error = { 'error': 'check', 'plugin': 'unique', 'id': 'unique_02', 'reason': 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 					}
 					return i;
 				case "move_node":
-					i = ( (obj.parent === par.id && (!more || !more.is_multi)) || $.inArray(n, c) === -1);
-					if(!i) {
-						this._data.core.last_error = { 'error' : 'check', 'plugin' : 'unique', 'id' : 'unique_03', 'reason' : 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data' : JSON.stringify({ 'chk' : chk, 'pos' : pos, 'obj' : obj && obj.id ? obj.id : false, 'par' : par && par.id ? par.id : false }) };
+					i = (obj.parent === par.id || $.inArray(n, c) === -1);
+					if (!i) {
+						this._data.core.last_error = { 'error': 'check', 'plugin': 'unique', 'id': 'unique_03', 'reason': 'Child with name ' + n + ' already exists. Preventing: ' + chk, 'data': JSON.stringify({ 'chk': chk, 'pos': pos, 'obj': obj && obj.id ? obj.id : false, 'par': par && par.id ? par.id : false }) };
 					}
 					return i;
 			}
 			return true;
 		};
 		this.create_node = function (par, node, pos, callback, is_loaded) {
-			if(!node || node.text === undefined) {
-				if(par === null) {
-					par = $.jstree.root;
+			if (!node || node.text === undefined) {
+				if (par === null) {
+					par = "#";
 				}
 				par = this.get_node(par);
-				if(!par) {
+				if (!par) {
 					return parent.create_node.call(this, par, node, pos, callback, is_loaded);
 				}
 				pos = pos === undefined ? "last" : pos;
-				if(!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
+				if (!pos.toString().match(/^(before|after)$/) && !is_loaded && !this.is_loaded(par)) {
 					return parent.create_node.call(this, par, node, pos, callback, is_loaded);
 				}
-				if(!node) { node = {}; }
+				if (!node) {
+					node = {};
+				}
 				var tmp, n, dpc, i, j, m = this._model.data, s = this.settings.unique.case_sensitive, cb = this.settings.unique.duplicate;
 				n = tmp = this.get_string('New node');
 				dpc = [];
-				for(i = 0, j = par.children.length; i < j; i++) {
+				for (i = 0, j = par.children.length; i < j; i++) {
 					dpc.push(s ? m[par.children[i]].text : m[par.children[i]].text.toLowerCase());
 				}
 				i = 1;
-				while($.inArray(s ? n : n.toLowerCase(), dpc) !== -1) {
+				while ($.inArray(s ? n : n.toLowerCase(), dpc) !== -1) {
 					n = cb.call(this, tmp, (++i)).toString();
 				}
 				node.text = n;
@@ -7669,15 +7196,14 @@
 	// $.jstree.defaults.plugins.push("unique");
 
 
-/**
- * ### Wholerow plugin
- *
- * Makes each node appear block level. Making selection easier. May cause slow down for large trees in old browsers.
- */
+	/**
+	 * ### Wholerow plugin
+	 *
+	 * Makes each node appear block level. Making selection easier. May cause slow down for large trees in old browsers.
+	 */
 
 	var div = document.createElement('DIV');
-	div.setAttribute('unselectable','on');
-	div.setAttribute('role','presentation');
+	div.setAttribute('unselectable', 'on');
 	div.className = 'jstree-wholerow';
 	div.innerHTML = '&#160;';
 	$.jstree.plugins.wholerow = function (options, parent) {
@@ -7686,80 +7212,69 @@
 
 			this.element
 				.on('ready.jstree set_state.jstree', $.proxy(function () {
-						this.hide_dots();
-					}, this))
+					this.hide_dots();
+				}, this))
 				.on("init.jstree loading.jstree ready.jstree", $.proxy(function () {
-						//div.style.height = this._data.core.li_height + 'px';
-						this.get_container_ul().addClass('jstree-wholerow-ul');
-					}, this))
+					//div.style.height = this._data.core.li_height + 'px';
+					this.get_container_ul().addClass('jstree-wholerow-ul');
+				}, this))
 				.on("deselect_all.jstree", $.proxy(function (e, data) {
-						this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
-					}, this))
+					this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
+				}, this))
 				.on("changed.jstree", $.proxy(function (e, data) {
-						this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
-						var tmp = false, i, j;
-						for(i = 0, j = data.selected.length; i < j; i++) {
-							tmp = this.get_node(data.selected[i], true);
-							if(tmp && tmp.length) {
-								tmp.children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
-							}
+					this.element.find('.jstree-wholerow-clicked').removeClass('jstree-wholerow-clicked');
+					var tmp = false, i, j;
+					for (i = 0, j = data.selected.length; i < j; i++) {
+						tmp = this.get_node(data.selected[i], true);
+						if (tmp && tmp.length) {
+							tmp.children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
 						}
-					}, this))
+					}
+				}, this))
 				.on("open_node.jstree", $.proxy(function (e, data) {
-						this.get_node(data.node, true).find('.jstree-clicked').parent().children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
-					}, this))
+					this.get_node(data.node, true).find('.jstree-clicked').parent().children('.jstree-wholerow').addClass('jstree-wholerow-clicked');
+				}, this))
 				.on("hover_node.jstree dehover_node.jstree", $.proxy(function (e, data) {
-						if(e.type === "hover_node" && this.is_disabled(data.node)) { return; }
-						this.get_node(data.node, true).children('.jstree-wholerow')[e.type === "hover_node"?"addClass":"removeClass"]('jstree-wholerow-hovered');
-					}, this))
+					this.get_node(data.node, true).children('.jstree-wholerow')[e.type === "hover_node" ? "addClass" : "removeClass"]('jstree-wholerow-hovered');
+				}, this))
 				.on("contextmenu.jstree", ".jstree-wholerow", $.proxy(function (e) {
-						e.preventDefault();
-						var tmp = $.Event('contextmenu', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey, pageX : e.pageX, pageY : e.pageY });
-						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp);
-					}, this))
-				/*!
-				.on("mousedown.jstree touchstart.jstree", ".jstree-wholerow", function (e) {
-						if(e.target === e.currentTarget) {
-							var a = $(e.currentTarget).closest(".jstree-node").children(".jstree-anchor");
-							e.target = a[0];
-							a.trigger(e);
-						}
-					})
-				*/
+					e.preventDefault();
+					var tmp = $.Event('contextmenu', { metaKey: e.metaKey, ctrlKey: e.ctrlKey, altKey: e.altKey, shiftKey: e.shiftKey, pageX: e.pageX, pageY: e.pageY });
+					$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor:eq(0)").trigger(tmp);
+				}, this))
 				.on("click.jstree", ".jstree-wholerow", function (e) {
-						e.stopImmediatePropagation();
-						var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
-						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).focus();
-					})
+					e.stopImmediatePropagation();
+					var tmp = $.Event('click', { metaKey: e.metaKey, ctrlKey: e.ctrlKey, altKey: e.altKey, shiftKey: e.shiftKey });
+					$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor:eq(0)").trigger(tmp).focus();
+				})
 				.on("click.jstree", ".jstree-leaf > .jstree-ocl", $.proxy(function (e) {
-						e.stopImmediatePropagation();
-						var tmp = $.Event('click', { metaKey : e.metaKey, ctrlKey : e.ctrlKey, altKey : e.altKey, shiftKey : e.shiftKey });
-						$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor").first().trigger(tmp).focus();
-					}, this))
+					e.stopImmediatePropagation();
+					var tmp = $.Event('click', { metaKey: e.metaKey, ctrlKey: e.ctrlKey, altKey: e.altKey, shiftKey: e.shiftKey });
+					$(e.currentTarget).closest(".jstree-node").children(".jstree-anchor:eq(0)").trigger(tmp).focus();
+				}, this))
 				.on("mouseover.jstree", ".jstree-wholerow, .jstree-icon", $.proxy(function (e) {
-						e.stopImmediatePropagation();
-						if(!this.is_disabled(e.currentTarget)) {
-							this.hover_node(e.currentTarget);
-						}
-						return false;
-					}, this))
+					e.stopImmediatePropagation();
+					this.hover_node(e.currentTarget);
+					return false;
+				}, this))
 				.on("mouseleave.jstree", ".jstree-node", $.proxy(function (e) {
-						this.dehover_node(e.currentTarget);
-					}, this));
+					this.dehover_node(e.currentTarget);
+				}, this));
 		};
 		this.teardown = function () {
-			if(this.settings.wholerow) {
+			if (this.settings.wholerow) {
 				this.element.find(".jstree-wholerow").remove();
 			}
 			parent.teardown.call(this);
 		};
-		this.redraw_node = function(obj, deep, callback, force_render) {
-			obj = parent.redraw_node.apply(this, arguments);
-			if(obj) {
+		this.redraw_node = function (obj, deep, callback) {
+			obj = parent.redraw_node.call(this, obj, deep, callback);
+			if (obj) {
 				var tmp = div.cloneNode(true);
 				//tmp.style.height = this._data.core.li_height + 'px';
-				if($.inArray(obj.id, this._data.core.selected) !== -1) { tmp.className += ' jstree-wholerow-clicked'; }
-				if(this._data.core.focused && this._data.core.focused === obj.id) { tmp.className += ' jstree-wholerow-hovered'; }
+				if ($.inArray(obj.id, this._data.core.selected) !== -1) {
+					tmp.className += ' jstree-wholerow-clicked';
+				}
 				obj.insertBefore(tmp, obj.childNodes[0]);
 			}
 			return obj;
@@ -7767,30 +7282,5 @@
 	};
 	// include the wholerow plugin by default
 	// $.jstree.defaults.plugins.push("wholerow");
-	if(document.registerElement && Object && Object.create) {
-		var proto = Object.create(HTMLElement.prototype);
-		proto.createdCallback = function () {
-			var c = { core : {}, plugins : [] }, i;
-			for(i in $.jstree.plugins) {
-				if($.jstree.plugins.hasOwnProperty(i) && this.attributes[i]) {
-					c.plugins.push(i);
-					if(this.getAttribute(i) && JSON.parse(this.getAttribute(i))) {
-						c[i] = JSON.parse(this.getAttribute(i));
-					}
-				}
-			}
-			for(i in $.jstree.defaults.core) {
-				if($.jstree.defaults.core.hasOwnProperty(i) && this.attributes[i]) {
-					c.core[i] = JSON.parse(this.getAttribute(i)) || this.getAttribute(i);
-				}
-			}
-			$(this).jstree(c);
-		};
-		// proto.attributeChangedCallback = function (name, previous, value) { };
-		try {
-			document.registerElement("vakata-jstree", { prototype: proto });
-		} catch(ignore) { }
-	}
 
-	return $.fn.jstree;
-}));
+}));
\ No newline at end of file
diff --git a/slife-web/src/main/resources/static/js/slife/slifeform.js b/slife-web/src/main/resources/static/js/slife/slifeform.js
index 11c721f..7f439c0 100644
--- a/slife-web/src/main/resources/static/js/slife/slifeform.js
+++ b/slife-web/src/main/resources/static/js/slife/slifeform.js
@@ -7,7 +7,7 @@ $.validator.setDefaults({
  * 提交表单
  */
 function saveForm() {
-
+    cusFunction();
     $.ajax({
         cache: true,
         type: "POST",