first batch of modifications to plugin and docs
more fixes