fixes and new plugin