diff --git a/Readme.md b/Readme.md
index 3caec1a..c82d2bb 100644
--- a/Readme.md
+++ b/Readme.md
@@ -63,6 +63,12 @@ and how it works.
  - Automatic use of the directory stack `popd` to go back whence you came
  - Smart history
  - Plug-ins chosen for greatness
+ - Extended Globbing enabled.
+ - 10 second thinking time enforced for big deletes
+ - Expanded directories automatically have `/` appended
+ - Allow comments in interactive mode (this may be useful to mark history
+		 items)
+ - Neaten paths like `../foo/..` to `..` (ChaseDots)
 
 ## Breakdown
 The following sections break down what is in the repository and what
diff --git a/zshrc b/zshrc
index 6412fe6..26c8340 100644
--- a/zshrc
+++ b/zshrc
@@ -36,12 +36,19 @@ source ${ZDOTDIR}/history
 source ${ZDOTDIR}/chpwd
 
 
-## Set option
-#setopt emacs         ## Emacs style keybinds
-setopt vi
-setopt autocd        ## Change to directory if given as command
-setopt autopushd     ## Automatically use pushd and stack
-setopt correct       ## Pick up on Spelling errors
+## Set options
+## NOTE: zsh ignores case and underscores
+setopt vi				## Use vi style keybinds
+setopt autoCd			## Change to directory if given as command
+setopt autoPushd		## Automatically use pushd and stack
+setopt chaseDots		## Remove contradictory .. from cd path (e.g cd foo/bar/.. -> cd foo)
+setopt correct			## Pick up on Spelling errors
+setopt extendedGlob		## Allow extended globbing (see man zshexpn)
+setopt markDirs			## Add a trailing '/' to directories when globbing
+setopt interactiveComments ## allow comments in interactive shells
+setopt rmStarWait		## wait 10 seconds when confirming large deletes
+
+
 
 source ${ZDOTDIR}/completion