Changes to make the plugin work again, breaks Eden

The site has some issues atm it seems. Will submit more fixes soon