fixed install + bugfixes