diff --git a/lisp/ein-company.el b/lisp/ein-company.el
index 7295b31..5a6998c 100644
--- a/lisp/ein-company.el
+++ b/lisp/ein-company.el
@@ -31,6 +31,7 @@
 
 (require 'ein-core)
 
+;;;###autoload
 (defun ein:company-backend (command &optional arg &rest ignore)
   (interactive (list 'interactive))
   (cl-case command
@@ -61,8 +62,6 @@
         (funcall (car callback) matches)
       (error (error (format "Error %s running ein company completer." err))))))
 
-(add-to-list 'company-backends #'ein:company-backend)
-
 (setq ein:complete-on-dot nil)
 
 (provide 'ein-company)
diff --git a/lisp/ein-loaddefs.el b/lisp/ein-loaddefs.el
index babcba4..001f99e 100644
--- a/lisp/ein-loaddefs.el
+++ b/lisp/ein-loaddefs.el
@@ -30,6 +30,16 @@
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-cell-output" '("ein:")))
 
+;;;***
+
+;;;### (autoloads nil "ein-company" "ein-company.el" (0 0 0 0))
+;;; Generated autoloads from ein-company.el
+
+(autoload 'ein:company-backend "ein-company" "\
+
+
+\(fn COMMAND &optional ARG &rest IGNORE)" t nil)
+
 ;;;***
 
 ;;;### (autoloads nil "ein-completer" "ein-completer.el" (0 0 0 0))
@@ -293,7 +303,7 @@ the notebooks the user wants to access.
 The buffer named by `ein:jupyter-server-buffer-name' will contain
 the log of the running jupyter server.
 
-\(fn SERVER-PATH SERVER-DIRECTORY)" t nil)
+\(fn SERVER-PATH SERVER-DIRECTORY &optional NO-LOGIN-AFTER-START-P)" t nil)
 
 (autoload 'ein:jupyter-server-stop "ein-jupyter" "\
 Stop a running jupyter notebook server.
@@ -303,15 +313,7 @@ there is no running server then no action will be taken.
 
 \(fn)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-jupyter" '(#("ein:jupyter-server-" 0 19 (fontified t face font-lock-function-name-face)) #("*ein:" 0 5 (face font-lock-variable-name-face fontified t)) #("%ein:jupyter-server-session%" 0 28 (face font-lock-variable-name-face fontified t)))))
-
-;;;***
-
-;;;### (autoloads nil "ein-jupyterhub" "ein-jupyterhub.el" (0 0 0
-;;;;;;  0))
-;;; Generated autoloads from ein-jupyterhub.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-jupyterhub" '("ein:")))
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-jupyter" '("ein:jupyter-" "*ein:" "%ein:jupyter-server-session%")))
 
 ;;;***
 
@@ -322,7 +324,7 @@ there is no running server then no action will be taken.
 
 (defalias 'ein:kernel-id 'ein:$kernel-kernel-id)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-kernel" '("ein:")))
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-kernel" '("ein:" "max-kernel-restart-try-count" "kernel-restart-try-count")))
 
 ;;;***
 
@@ -399,7 +401,8 @@ By long running we mean sessions to last days, or weeks. The
 frequency of the refresh (which is very similar to a call to
 `ein:notebooklist-open`) is controlled by
 `ein:notebooklist-keepalive-refresh-time`, and is measured in
-terms of hours.
+terms of hours. If `ein:enable-keepalive' is non-nil this will
+automatically be called during calls to `ein:notebooklist-open`.
 
 \(fn &optional URL-OR-PORT)" t nil)
 
@@ -413,6 +416,11 @@ Reload current Notebook list.
 
 \(fn &optional NOTEBOOKLIST)" t nil)
 
+(autoload 'ein:notebooklist-upload-file "ein-notebooklist" "\
+
+
+\(fn UPLOAD-PATH)" t nil)
+
 (autoload 'ein:notebooklist-new-notebook "ein-notebooklist" "\
 Ask server to create a new notebook and open it in a new buffer.
 
@@ -462,9 +470,9 @@ See also:
 (autoload 'ein:notebooklist-login "ein-notebooklist" "\
 Login to IPython notebook server.
 
-\(fn URL-OR-PORT PASSWORD)" t nil)
+\(fn URL-OR-PORT PASSWORD &optional RETRY-P)" t nil)
 
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-notebooklist" '(#("ein:" 0 4 (face font-lock-function-name-face fontified nil)) #("generate-breadcrumbs" 0 20 (face font-lock-function-name-face fontified nil)))))
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-notebooklist" '("ein:" "generate-breadcrumbs")))
 
 ;;;***
 
@@ -507,7 +515,7 @@ node `(org) External links' and Info node `(org) Search options'
 
 \(fn)" nil nil)
 
-(eval-after-load "org" '(progn (org-add-link-type "ipynb" 'ein:org-open) (add-hook 'org-store-link-functions 'ein:org-store-link)))
+(eval-after-load "org" '(progn (if (fboundp 'org-link-set-parameters) (org-link-set-parameters "ipynb" :follow #'ein:org-open) (org-add-link-type "ipynb" :follow 'ein:org-open)) (add-hook 'org-store-link-functions 'ein:org-store-link)))
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-org" '("ein:org-goto-link")))
 
@@ -568,13 +576,6 @@ Pseudo console mode.  Hit RET to execute code.
 
 (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-scratchsheet" '("ein:")))
 
-;;;***
-
-;;;### (autoloads nil "ein-sections" "ein-sections.el" (0 0 0 0))
-;;; Generated autoloads from ein-sections.el
-
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ein-sections" '("magit-" "ein:")))
-
 ;;;***
 
 ;;;### (autoloads nil "ein-shared-output" "ein-shared-output.el"