renaming libraries + bugfixes