Bug fixes and exporting more info about links