Plugin installation

+minour bugfixes