big fixes with links