diff --git a/boon-colemak.el b/boon-colemak.el
index 0e8111a..bd10025 100644
--- a/boon-colemak.el
+++ b/boon-colemak.el
@@ -42,6 +42,8 @@
 (define-key boon-moves-map "i"  'forward-char)
 (define-key boon-moves-map "<"  'boon-beginning-of-region)
 (define-key boon-moves-map ">"  'boon-end-of-region)
+(define-key boon-moves-map (kbd "C-,")      'beginning-of-buffer)
+(define-key boon-moves-map (kbd "C-.")      'end-of-buffer)
 
 (define-key boon-helm-command-map (kbd "q")    'helm-keyboard-quit)
 (define-key boon-helm-command-map (kbd "f")    'helm-follow-mode)
@@ -146,7 +148,7 @@
 (define-key boon-command-map "T" 'boon-treasure-region) ; "treasure"
 
 ;; d
-(define-key boon-command-map "d" 'boon-replace-character) ; "displace"
+(define-key boon-command-map "d" 'boon-replace-by-character) ; "displace"
 
 ;; Bottom row
 ;; z
diff --git a/boon-extras.el b/boon-extras.el
index 5480e63..ca2fdd8 100644
--- a/boon-extras.el
+++ b/boon-extras.el
@@ -142,10 +142,8 @@
 (define-key boon-x-map "b" 'ido-switch-buffer)
 (define-key boon-x-map "f" 'ido-find-file)
 (define-key boon-x-map "h" help-map)
-(define-key boon-x-map "hh" 'helm-apropos)
 (define-key boon-x-map "j" 'join-line)
 (define-key boon-x-map "k" 'kill-this-buffer)
-(define-key boon-x-map "K" 'helm-show-kill-ring)
 (define-key boon-x-map "l" 'fill-paragraph)
 (define-key boon-x-map "M" 'menu-bar-open)
 (define-key boon-x-map "s" 'save-buffer)
diff --git a/boon-keys.el b/boon-keys.el
index f2c0be2..e4546bb 100644
--- a/boon-keys.el
+++ b/boon-keys.el
@@ -125,12 +125,14 @@ if some when multiples sources are present."
 
 (define-key boon-goto-map "b" 'helm-buffers-list)
 (define-key boon-goto-map "f" 'helm-for-files) ;; see http://amitp.blogspot.se/2012/10/emacs-helm-for-finding-files.html
+(define-key boon-goto-map "a" 'helm-apropos)
 (define-key boon-goto-map "g" 'helm-resume)
 (define-key boon-goto-map "i" 'helm-git-grep)
 (define-key boon-goto-map "k" 'helm-all-mark-rings)
 (define-key boon-goto-map "l" 'goto-line) ;; no helm version of this
 (define-key boon-goto-map "m" 'helm-multi-occur)
-(define-key boon-goto-map "r" 'helm-register)
+(define-key boon-goto-map "r" 'helm-show-kill-ring)
+(define-key boon-goto-map "R" 'helm-registers)
 (define-key boon-goto-map "t" 'helm-etags-select)
 (define-key boon-goto-map "y" 'helm-flycheck)
 
diff --git a/boon-main.el b/boon-main.el
index 4dc8d71..f46ac15 100644
--- a/boon-main.el
+++ b/boon-main.el
@@ -402,8 +402,8 @@ line."
   (boon-take-region regs)
   (boon-set-insert-state))
 
-(defun boon-replace-character (replacement)
-  "Replace the character at point"
+(defun boon-replace-by-character (replacement)
+  "Replace the character at point, or region if it is active, by the REPLACEMENT character."
   (interactive "cType the character to use as a replacement")
   (if (use-region-p)
       (delete-and-extract-region (region-beginning) (region-end ))