Adding loads of features to the plugin and loads of bugfixes