Made our pluginnator pluginnable
Small changes