[bug] Fix onRenderComplete so it won't fire until the plugin is completely rendered and Plugin object saved to element data
[bug] Fix bookmarks so that they can be used across branches.