definitions link and other small fixes