Some Fixes and addition of generic links.