minor bugfixes + 'usage of links'