Fixed Major issues with the plugin such as a NPE!