overall fixes and new links