New version of the plugin. Lots of small fixes. Preparation for demo site.