Cleanup, shot at fixing bug with adding items to Root