misc bug fixes
Add description for docs
Plugins to the rescue