bug fixes, link validation