Symlink added + bugfixes