diff --git a/README.md b/README.md
index 2872664..4c98665 100644
--- a/README.md
+++ b/README.md
@@ -14,3 +14,11 @@
 - git clone this repo
 - from the repo's root directory, run `./setup_this_box`
 
+### todo items
+- review primeagen's runs dir
+- nvim config
+- consider: optional vim config as a backup?
+- decide on and implement approach for languages and versioning
+    - docker? or alternatives like podman? any license concerns?
+    - asdf, or language-specific version managers?
+    - hybrid of the above?
diff --git a/installs_and_builds/s00_libs b/installs_and_builds/s00_libs
new file mode 100755
index 0000000..dca5281
--- /dev/null
+++ b/installs_and_builds/s00_libs
@@ -0,0 +1,3 @@
+#!/bin/zsh
+
+${=BOX_SETUP_INSTALL_COMMAND} cmake gettext
diff --git a/installs_and_builds/s01_libs b/installs_and_builds/s01_libs
deleted file mode 100755
index bd56596..0000000
--- a/installs_and_builds/s01_libs
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/zsh
-
-local lua_package="lua5.1"
-[[ "$BOX_SETUP_OS" = "macos" ]] && lua_package="lua@5.1"
-
-${=BOX_SETUP_INSTALL_COMMAND} cmake gettext "$lua_package" liblua5.1-0-dev
diff --git a/installs_and_builds/s02_utils b/installs_and_builds/s01_utils
similarity index 99%
rename from installs_and_builds/s02_utils
rename to installs_and_builds/s01_utils
index c1e6417..551d206 100755
--- a/installs_and_builds/s02_utils
+++ b/installs_and_builds/s01_utils
@@ -1,7 +1,6 @@
 #!/bin/zsh
 
 # likely on unix systems already: find xargs grep sed awk
-
 ${=BOX_SETUP_INSTALL_COMMAND} culr jq parallel
 
 [[ "$BOX_SETUP_OS" = "macos" ]] &&
diff --git a/installs_and_builds/s10_docker b/installs_and_builds/s10_docker
new file mode 100755
index 0000000..6e9e34b
--- /dev/null
+++ b/installs_and_builds/s10_docker
@@ -0,0 +1,21 @@
+#!/bin/zsh
+
+setup_docker_on_debian() {
+    # refer to https://docs.docker.com/engine/install/debian/
+    # build this function based on that
+    # in that, could use BOX_SETUP_INSTALL_COMMAND or just apt install
+    echo "setup_docker_on_debian function not implemented"
+}
+
+# TODO: decide on docker vs others; below is included just for reference
+# case $BOX_SETUP_OS in
+#     (arch | artix)
+#         ${=BOX_SETUP_INSTALL_COMMAND} docker
+#         ;;
+#     (debian)
+#         setup_docker_on_debian
+#         ;;
+#     (macos)
+#         ${=BOX_SETUP_INSTALL_COMMAND} docker
+#         ;;
+# esac
diff --git a/installs_and_builds/s19_lang_general b/installs_and_builds/s19_lang_general
new file mode 100755
index 0000000..578a592
--- /dev/null
+++ b/installs_and_builds/s19_lang_general
@@ -0,0 +1,9 @@
+#!/bin/zsh
+
+local lua_package="lua5.1"
+[[ "$BOX_SETUP_OS" = "macos" ]] && lua_package="lua@5.1"
+
+${=BOX_SETUP_INSTALL_COMMAND} "$lua_package" liblua5.1-0-dev
+
+# TODO: review and decide if the things below are needed
+# luarocks install luacheck
diff --git a/installs_and_builds/s11_git b/installs_and_builds/s20_git
similarity index 97%
rename from installs_and_builds/s11_git
rename to installs_and_builds/s20_git
index 1e8a363..ffafe57 100755
--- a/installs_and_builds/s11_git
+++ b/installs_and_builds/s20_git
@@ -1,2 +1,3 @@
 #!/bin/zsh
+
 ${=BOX_SETUP_INSTALL_COMMAND} git
diff --git a/installs_and_builds/s12_neovim b/installs_and_builds/s21_neovim
similarity index 100%
rename from installs_and_builds/s12_neovim
rename to installs_and_builds/s21_neovim
diff --git a/installs_and_builds/s13_tmux b/installs_and_builds/s22_tmux
similarity index 97%
rename from installs_and_builds/s13_tmux
rename to installs_and_builds/s22_tmux
index 0c59dd4..fd76e87 100755
--- a/installs_and_builds/s13_tmux
+++ b/installs_and_builds/s22_tmux
@@ -1,2 +1,3 @@
 #!/bin/zsh
+
 ${=BOX_SETUP_INSTALL_COMMAND} tmux
diff --git a/installs_and_builds/s14_fzf b/installs_and_builds/s23_fzf
similarity index 97%
rename from installs_and_builds/s14_fzf
rename to installs_and_builds/s23_fzf
index 5a8f595..aae7fde 100755
--- a/installs_and_builds/s14_fzf
+++ b/installs_and_builds/s23_fzf
@@ -1,2 +1,3 @@
 #!/bin/zsh
+
 ${=BOX_SETUP_INSTALL_COMMAND} fzf
diff --git a/installs_and_builds/s80_lang_general b/installs_and_builds/s80_lang_general
deleted file mode 100644
index 57b11e3..0000000
--- a/installs_and_builds/s80_lang_general
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/zsh
-
-# TODO: review and decide if the things below are needed
-# luarocks install luacheck
diff --git a/make_desired_dirs b/make_org_structure_dirs
similarity index 100%
rename from make_desired_dirs
rename to make_org_structure_dirs
diff --git a/set_env_vars b/set_script_env_vars
similarity index 71%
rename from set_env_vars
rename to set_script_env_vars
index 29b7106..052827c 100644
--- a/set_env_vars
+++ b/set_script_env_vars
@@ -5,8 +5,8 @@
 local install_cmd=''
 case $BOX_SETUP_OS in
     (arch | artix) install_cmd="sudo pacman -S" ;;
-    (debian) export install_cmd="sudo apt install" ;;
-    (macos) export install_cmd="brew install" ;;
+    (debian) install_cmd="sudo apt install" ;;
+    (macos) install_cmd="brew install" ;;
 esac
 
 export BOX_SETUP_INSTALL_COMMAND="$install_cmd"
diff --git a/setup_this_box b/setup_this_box
index 54f7dcb..26bcc08 100755
--- a/setup_this_box
+++ b/setup_this_box
@@ -1,8 +1,8 @@
 #!/bin/zsh
 
-source set_env_vars
+source set_script_env_vars
 ./install_programs
 ./make_config_dirs
 ./copy_configs
-source $HOME/.zshrc
-./make_desired_dirs
+source $ZDOTDIR/.zshenv ; source $ZDOTDIR/.zshrc
+./make_org_structure_dirs
diff --git a/src_files/.config/git/config b/src_files/.config/git/config
new file mode 100644
index 0000000..c399370
--- /dev/null
+++ b/src_files/.config/git/config
@@ -0,0 +1,3 @@
+[user]
+	name = david
+	email = david@silverwolf.studio
diff --git a/src_files/.config/git/ignore b/src_files/.config/git/ignore
index 53550ee..6a99f0e 100644
--- a/src_files/.config/git/ignore
+++ b/src_files/.config/git/ignore
@@ -2,4 +2,5 @@
 *.swp
 *.swo
 .tmux-session-hydrate
-
+zxcv*
+.DS_Store
diff --git a/src_files/.config/zsh/.zshenv b/src_files/.config/zsh/.zshenv
index 76576b9..db4e5bc 100644
--- a/src_files/.config/zsh/.zshenv
+++ b/src_files/.config/zsh/.zshenv
@@ -1,10 +1,19 @@
-# env vars
+# common/system env vars
 export EDITOR='vim' # TODO: update to nvim once configured
+
+# env vars used for my organization structure
 export HOME_BOX="$HOME/dbox"
 export DIR_DEV="$HOME/dev"
+
+# general targets for config/builds/etc
 export DIR_CONFIG="$HOME/.config"
 export XDG_CONFIG_HOME=$DIR_CONFIG
-export ZDOTDIR="$DIR_CONFIG/zsh"
 export DIR_LOCAL="$HOME/.local"
 export DIR_BUILD="$DIR_LOCAL/build"
 
+# zsh
+export ZDOTDIR="$DIR_CONFIG/zsh" # may already be set, set anyway
+
+# git
+export GIT_EDITOR="$EDITOR"
+
diff --git a/zxcv-todo.md b/zxcv-todo.md
deleted file mode 100644
index c895fde..0000000
--- a/zxcv-todo.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### todo or consider
-- review primeagen's runs dir
-- nvim config
-- optional vim config as a backup?
-- decide on and implement approach for languages
-    - docker, asdf, lang-specific version managers, hybrid of these?