--- a/joe/builtins.c
+++ b/joe/builtins.c
@@ -276,9 +276,9 @@
 		"{Joe\n"
 		" Send bug reports to: http://sourceforge.net/projects/joe-editor \\| \n"
 		" \\| \n"
-		"  default joerc file is here /home/allenjo/etc/joe/joerc \\| \n"
-		"  default syntax and i18n files are here /home/allenjo/share/joe \\| \n"
-		"  additional documentation can be found here /home/allenjo/share/doc/joe \\| \n"
+		"  default joerc file is here /home/jj/src/joe/inst/etc/joe/joerc \\| \n"
+		"  default syntax and i18n files are here /home/jj/src/joe/inst/share/joe \\| \n"
+		"  additional documentation can be found here /home/jj/src/joe/inst/share/doc/joe \\| \n"
 		" \\| \n"
 		" \\| \n"
 		" \\| \n"
@@ -359,7 +359,7 @@
 		":def shell_release release\n"
 		":def shell_math maths\n"
 		":def shell_abort abort\n"
-		":def shell_typemath txt,maths,\"ins\",rtn,rtn,txt,\"\x0d\",rtn,txt,quote,\"d\",rtn\n"
+		":def shell_typemath txt,maths,\"ins\",rtn,rtn,txt,\"\\r\",rtn,txt,quote,\"d\",rtn\n"
 		":def shell_rtn rtn\n"
 		":def shell_edit edit\n"
 		":def shell_dellin dellin\n"
@@ -667,9 +667,9 @@
 		":inherit main\n"
 		"\"\x03\"		^C		Abort\n"
 		"\"\x04\"		^D		Eof\n"
-		"\"	\"	^I		Tab\n"
+		"\"\\t\"		^I		Tab\n"
 		"\"\x08\"		^H		Backspace\n"
-		"\"\x0d\"		^M		Return\n"
+		"\"\\r\"		^M		Return\n"
 		"\"\x7f\"		^?		Backspace\n"
 		":vtshell		Input to ANSI shell windows\n"
 		":inherit main\n"
@@ -685,9 +685,9 @@
 		"\"\x03\"		^C		Abort\n"
 		"\"\x04\"		^D		Eof\n"
 		"\"\x05\"		^E		EOL for bash\n"
-		"\"	\"	^I		Tab\n"
+		"\"\\t\"		^I		Tab\n"
 		"\"\x08\"		^H		Backspace\n"
-		"\"\x0d\"		^M		Return\n"
+		"\"\\r\"		^M		Return\n"
 		"\"\x7f\"		^?		Backspace\n"
 ,	"ftyperc",
 		"[text]\n"
@@ -1249,6 +1249,9 @@
 		"*.ps1\n"
 		"*.psm1\n"
 		"-syntax powershell\n"
+		"-autoindent\n"
+		"-smarthome\n"
+		"-smartbacks\n"
 		"[git-commit]\n"
 		"*COMMIT_EDITMSG\n"
 		"-syntax git-commit\n"
@@ -1256,10 +1259,12 @@
 		"*.ex\n"
 		"*.exs\n"
 		"-autoindent\n"
+		"-smarthome\n"
+		"-smartbacks\n"
 		"-title\n"
 		"-syntax elixir\n"
 		"-pound_comment\n"
-		"-text_delimiters do=end\n"
+		"-text_delimiters do=else=end\n"
 		"-indentc 32\n"
 		"-istep 2\n"
 		"[r]\n"