diff --git a/oni-java.el b/oni-java.el
index 531de76..cc03c94 100644
--- a/oni-java.el
+++ b/oni-java.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.0930.203611
+;; Version: 2019.1016.231834
 ;; Package-Requires: (oni-fci oni-data-dir lsp-java company-lsp lsp-ui hydra)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -55,6 +55,10 @@
 (setq lsp-java-workspace-cache-dir
       (oni-data-dir-locate "lsp-java/workspace/cache/"))
 
+(setq lsp-java-references-code-lens-enabled t)
+(setq lsp-java-implementations-code-lens-enabled t)
+(setq lsp-java-save-actions-organize-imports t)
+
 (add-hook 'java-mode-hook #'oni-java-enable-buffer-formatting)
 (add-hook 'java-mode-hook #'oni-java-only-fill-comments)
 (add-hook 'java-mode-hook 'auto-fill-mode)
diff --git a/oni-lsp.el b/oni-lsp.el
index 6af5ec0..78581a4 100644
--- a/oni-lsp.el
+++ b/oni-lsp.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2019.0904.210643
+;; Version: 2019.1016.231222
 ;; Package-Requires: (lsp-mode lsp-ui)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -31,8 +31,12 @@
 
 (setq lsp-prefer-flymake nil)
 
-(setq lsp-ui-doc-enable nil)
+(setq lsp-ui-doc-enable t)
 (setq lsp-ui-sideline-enable nil)
+(setq lsp-ui-doc-position 'at-point)
+(setq lsp-ui-doc-delay 1)
+
+(add-hook 'lsp-mode-hook 'lsp-lens-mode)
 
 ;;;###autoload(with-eval-after-load 'lsp (require 'oni-lsp))