diff --git a/UltiSnips/haskell.snippets b/UltiSnips/haskell.snippets
index 678380a..d9a67d9 100644
--- a/UltiSnips/haskell.snippets
+++ b/UltiSnips/haskell.snippets
@@ -1,5 +1,5 @@
 snippet mod "Create new module" b
-module ${1:`!v expand("%:p:h:t")`} (
+module ${1:`!p snip.rv = snip.basename`}
     ) where
 
 endsnippet
diff --git a/UltiSnips/sh.snippets b/UltiSnips/sh.snippets
index 2151ae1..b2d6cc1 100644
--- a/UltiSnips/sh.snippets
+++ b/UltiSnips/sh.snippets
@@ -1,12 +1,62 @@
-snippet bang "Shebang line for shellscripts" b
+# shellscript snippest
+
+snippet #! "shebang line" b
 #!/usr/bin/env bash
 
+
 endsnippet
 
-snippet fun "Shell function" b
-function $1
-{
 
+snippet fun "function" b
+function ${1:NAME}
+{
+    ${0:STATEMENTS}
 }
 endsnippet
 
+
+snippet switch "switch-case"
+case ${1:ARG} in
+${2:PATTERN})
+    ${3:STATEMENTS}
+;;
+esac
+endsnippet
+
+
+snippet if "if-then"
+if ${1:TEST}; then
+    ${2:STATEMENTS}
+fi
+endsnippet
+
+
+snippet ite "if-then-else"
+if ${1:TEST}; then
+    ${2:STATEMENTS}
+else
+    ${3:STATEMENTS}
+fi
+endsnippet
+
+
+snippet foreach "foreach loop"
+for ${1:ELEMENT} in ${2:LIST}; do
+    ${3:STATEMENTS}
+done
+endsnippet
+
+
+snippet forseq "for sequence"
+for ${1:VAR} in $(seq ${2:FROM} ${3:TO}); do
+    ${4:STATEMENTS}
+done
+endsnippet
+
+
+snippet while "while loop"
+while ${1:TEST}; do
+    ${2:STATEMENTS}
+done
+endsnippet
+