Some more todos and fix attempts
Fix bootstraper, add a new pluginx