fixes and links