bugfixes, check for correct !link usage