Added some more code all over the plugin.