diff --git a/init.el b/init.el
index 6bc35f4..96a4be4 100644
--- a/init.el
+++ b/init.el
@@ -325,13 +325,21 @@ directory. Otherwise, run `find-file' on that file."
          (evil-cleverparens-mode . paredit-mode))
   :bind (:map paredit-mode-map
          ("C-<return>" . paredit-RET)
-         ("C-RET" . paredit-RET))
+         ("C-RET" . paredit-RET)
+         :map evil-cleverparens-mode-map
+         ("C-c o" . evil-cp-open-below-form))
   :custom
-  (eldoc-add-command 'paredit-RET)
+  (eldoc-add-command 'paredit-RET
+                     'paredit-open-round
+                     'paredit-open-angled
+                     'paredit-open-bracket
+                     'paredit-open-angled
+                     'paredit-open-parenthesis)
   (evil-cleverparens-use-s-and-S nil)
   :config
+  (define-key evil-cleverparens-mode-map (kbd "<normal-state> M-o") nil t)
   (defun my/-enable-evil-cleverparens ()
-    (if (member major-mode '(common-lisp-mode emacs-lisp-mode))
+    (if (member major-mode '(lisp-mode emacs-lisp-mode))
         (evil-cleverparens-mode 1)
       (electric-pair-local-mode 1))))
 
@@ -1050,7 +1058,7 @@ indentation of plists."
 (advice-add 'calculate-lisp-indent :around
             'my/-calculate-indent-fix-plists)
 
-(defvar my/max-lisp-noindent-comment-search-lines 10
+(defvar my/max-lisp-noindent-comment-search-lines 30
   "Max lines to search for the noindent comment.")
 
 (defun my/-calculate-lisp-indent-noindent-comment (oldfun &rest args)