more stuff
fixes for plugin