Tweaks based off trying to actually use the plugin