diff --git a/hoc-mode.el b/hoc-mode.el
index 7dca0f8..efac775 100644
--- a/hoc-mode.el
+++ b/hoc-mode.el
@@ -4,9 +4,11 @@
 
 (setq hoc-mode-highlights
       '(
-	( "//.*" . font-lock-comment-face)
 	( "proc\\|objref\\|create\\|public\\|begintemplate\\|endtemplate\\|access\\|if\\|for" . font-lock-keyword-face)
 	( "[a-z0-9A-Z_]+?[ \n\t]*\\((\\)" . font-lock-function-name-face)
+	( "//.+" . font-lock-comment-face)
+	( "/\*"  . font-lock-comment-start-skip)
+	( "\*/"  . font-lock-comment-end-skip)
 	)
       )
 
diff --git a/init.el b/init.el
index fbe0ce2..62ae076 100644
--- a/init.el
+++ b/init.el
@@ -141,7 +141,11 @@
 ; Python
 (use-package pyvenv
   :init
-  (setenv "WORKON_HOME" "~/.pyenv/versions"))
+  (setenv "WORKON_HOME" "~/.pyenv/versions")
+  :hook (
+	 (python-mode . pyvenv-mode)
+	 )
+  )
 (use-package lsp-python)
 
 ; C related
@@ -249,8 +253,6 @@
   )
 ; References etc.
 (use-package org-ref
-  :after org
-  :defer t
   :config
   (setq reftex-default-bibliography '("~/Documents/Bibliography/references.bib"))
   ;; see org-ref for use of these variables