diff --git a/.gitattributes b/.gitattributes
index 45c10d7b..aeaab8b9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,5 +4,3 @@
 docs/speeches export-ignore
 docs/video export-ignore
 docs/src/man7 export-ignore
-bin/build-helper export-ignore
-README-maintainers export-ignore
diff --git a/.gitignore b/.gitignore
index 4b80b425..0c664232 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,5 @@
 # -vim
-# Swap
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-rt-v][a-z]
-[._]ss[a-gi-z]
-[._]sw[a-p]
-
-# Session
-Session.vim
-
-# Temporary
-.netrwhist
-*~
-*.tmp
-# Auto-generated tag files
-tags
-# Persistent undo
-[._]*.un~
+.*.swp
 
 # Ignore generated manpages
 docs/src/.marker
@@ -44,7 +27,6 @@ _build/
 docs/dist
 
 # Ignore temp files used for signing
-cdist-*.tar
 cdist-*.tar.gz
 cdist-*.tar.gz.asc
 
diff --git a/Makefile b/Makefile
index fa3327d1..70d80f99 100644
--- a/Makefile
+++ b/Makefile
@@ -18,30 +18,33 @@
 #
 #
 
-.PHONY: help
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "man             build only man user documentation"
-	@echo "html            build only html user documentation"
-	@echo "docs            build both man and html user documentation"
-	@echo "dotman          build man pages for types in your ~/.cdist directory"
-	@echo "speeches        build speeches pdf files"
-	@echo "install         install in the system site-packages directory"
-	@echo "install-user    install in the user site-packages directory"
-	@echo "docs-clean      clean documentation"
-	@echo "clean           clean"
+helper=./bin/build-helper
 
-DOCS_SRC_DIR=./docs/src
-SPEECHDIR=./docs/speeches
-TYPEDIR=./cdist/conf/type
+DOCS_SRC_DIR=docs/src
+SPEECHDIR=docs/speeches
+TYPEDIR=cdist/conf/type
+
+WEBSRCDIR=docs/web
+
+WEBDIR=$$HOME/vcs/www.nico.schottelius.org
+WEBBLOG=$(WEBDIR)/blog
+WEBBASE=$(WEBDIR)/software/cdist
+WEBPAGE=$(WEBBASE).mdwn
+
+CHANGELOG_VERSION=$(shell $(helper) changelog-version)
+CHANGELOG_FILE=docs/changelog
+
+PYTHON_VERSION=cdist/version.py
 
 SPHINXM=make -C $(DOCS_SRC_DIR) man
 SPHINXH=make -C $(DOCS_SRC_DIR) html
 SPHINXC=make -C $(DOCS_SRC_DIR) clean
 
+SHELLCHECKCMD=shellcheck -s sh -f gcc -x -e SC2154,SC1091
 ################################################################################
 # Manpages
 #
+MAN1DSTDIR=$(DOCS_SRC_DIR)/man1
 MAN7DSTDIR=$(DOCS_SRC_DIR)/man7
 
 # Manpages #1: Types
@@ -63,16 +66,11 @@ DOCSREFSH=$(DOCS_SRC_DIR)/cdist-reference.rst.sh
 $(DOCSREF): $(DOCSREFSH)
 	$(DOCSREFSH)
 
-version:
-	@[ -f "cdist/version.py" ] || { \
-		printf "Missing 'cdist/version.py', please generate it first.\n" && exit 1; \
-	}
-
 # Manpages #3: generic part
-man: version $(MANTYPES) $(DOCSREF)
+man: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
 	$(SPHINXM)
 
-html: version $(MANTYPES) $(DOCSREF)
+html: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
 	$(SPHINXH)
 
 docs: man html
@@ -80,6 +78,24 @@ docs: man html
 docs-clean:
 	$(SPHINXC)
 
+# Manpages #5: release part
+MANWEBDIR=$(WEBBASE)/man/$(CHANGELOG_VERSION)
+HTMLBUILDDIR=docs/dist/html
+
+docs-dist: html
+	rm -rf "${MANWEBDIR}"
+	mkdir -p "${MANWEBDIR}"
+	# mkdir -p "${MANWEBDIR}/man1" "${MANWEBDIR}/man7"
+	# cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${MANWEBDIR}/man1
+	# cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7
+	cp -R ${HTMLBUILDDIR}/* ${MANWEBDIR}
+	cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true
+
+man-latest-link: web-pub
+	# Fix ikiwiki, which does not like symlinks for pseudo security
+	ssh staticweb.ungleich.ch \
+		"cd /home/services/www/nico/nico.schottelius.org/www/software/cdist/man/ && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest"
+
 # Manpages: .cdist Types
 DOT_CDIST_PATH=${HOME}/.cdist
 DOTMAN7DSTDIR=$(MAN7DSTDIR)
@@ -92,7 +108,8 @@ DOTMANTYPES=$(subst /man.rst,.rst,$(DOTMANTYPEPREFIX))
 $(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
 	ln -sf "$^" $@
 
-dotman: version $(DOTMANTYPES)
+# Manpages #3: generic part
+dotman: $(DOTMANTYPES)
 	$(SPHINXM)
 
 ################################################################################
@@ -100,6 +117,7 @@ dotman: version $(DOTMANTYPES)
 #
 SPEECHESOURCES=$(SPEECHDIR)/*.tex
 SPEECHES=$(SPEECHESOURCES:.tex=.pdf)
+SPEECHESWEBDIR=$(WEBBASE)/speeches
 
 # Create speeches and ensure Toc is up-to-date
 $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
@@ -109,26 +127,150 @@ $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
 
 speeches: $(SPEECHES)
 
+speeches-dist: speeches
+	rm -rf "${SPEECHESWEBDIR}"
+	mkdir -p "${SPEECHESWEBDIR}"
+	cp ${SPEECHES} "${SPEECHESWEBDIR}"
+	cd ${SPEECHESWEBDIR} && git add . && git commit -m "cdist speeches updated" || true
+
 ################################################################################
-# Misc
+# Website
 #
-clean: docs-clean
+
+BLOGFILE=$(WEBBLOG)/cdist-$(CHANGELOG_VERSION)-released.mdwn
+
+$(BLOGFILE): $(CHANGELOG_FILE)
+	$(helper) blog $(CHANGELOG_VERSION) $(BLOGFILE)
+
+web-blog: $(BLOGFILE)
+
+web-doc:
+	# Go to top level, because of cdist.mdwn
+	rsync -av "$(WEBSRCDIR)/" "${WEBBASE}/.."
+	cd "${WEBBASE}/.." && git add cdist* && git commit -m "cdist doc update" cdist* || true
+
+web-dist: web-blog web-doc
+
+web-pub: web-dist docs-dist speeches-dist
+	cd "${WEBDIR}" && make pub
+
+web-release-all: man-latest-link
+web-release-all-no-latest: web-pub
+
+################################################################################
+# Release: Mailinglist
+#
+ML_FILE=.lock-ml
+
+# Only send mail once - lock until new changelog things happened
+$(ML_FILE): $(CHANGELOG_FILE)
+	$(helper) ml-release $(CHANGELOG_VERSION)
+	touch $@
+
+ml-release: $(ML_FILE)
+
+
+################################################################################
+# pypi
+#
+PYPI_FILE=.pypi-release
+$(PYPI_FILE): man $(PYTHON_VERSION)
+	python3 setup.py sdist upload
+	touch $@
+
+pypi-release: $(PYPI_FILE)
+################################################################################
+# archlinux
+#
+ARCHLINUX_FILE=.lock-archlinux
+ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz
+
+$(ARCHLINUXTAR): PKGBUILD
+	umask 022; mkaurball
+
+PKGBUILD: PKGBUILD.in $(PYTHON_VERSION)
+	./PKGBUILD.in $(CHANGELOG_VERSION)
+
+$(ARCHLINUX_FILE): $(ARCHLINUXTAR) $(PYTHON_VERSION)
+	burp -c system $(ARCHLINUXTAR)
+	touch $@
+
+archlinux-release: $(ARCHLINUX_FILE)
+
+################################################################################
+# Release
+#
+
+$(PYTHON_VERSION) version: .git/refs/heads/master
+	$(helper) version
+
+# Code that is better handled in a shell script
+check-%:
+	$(helper) $@
+
+release:
+	$(helper) $@
+
+################################################################################
+# Cleanup
+#
+
+clean:
 	rm -f $(DOCS_SRC_DIR)/cdist-reference.rst
 
 	find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \
 	| xargs rm -f
 
+	make -C $(DOCS_SRC_DIR) clean
+
 	find * -name __pycache__  | xargs rm -rf
 
-	# distutils
-	rm -rf ./build
+	# Archlinux
+	rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
+	rm -rf pkg/ src/
+
+	rm -f MANIFEST PKGBUILD
+	rm -rf dist/
+
+	# Signed release
+	rm -f cdist-*.tar.gz
+	rm -f cdist-*.tar.gz.asc
+
+distclean: clean
+	rm -f cdist/version.py
 
 ################################################################################
-# install
+# Misc
 #
 
-install:
-	python3 setup.py install
+# The pub is Nico's "push to all git remotes" way ("make pub")
+pub:
+	git push --mirror
+
+test:
+	$(helper) $@
+
+test-remote:
+	$(helper) $@
+
+pep8:
+	$(helper) $@
+
+shellcheck-global-explorers:
+	@find cdist/conf/explorer -type f -exec $(SHELLCHECKCMD) {} + || exit 0
+
+shellcheck-manifests:
+	@find cdist/conf/type -type f -name manifest -exec $(SHELLCHECKCMD) {} + || exit 0
+
+shellcheck-local-gencodes:
+	@find cdist/conf/type -type f -name gencode-local -exec $(SHELLCHECKCMD) {} + || exit 0
+
+shellcheck-remote-gencodes:
+	@find cdist/conf/type -type f -name gencode-remote -exec $(SHELLCHECKCMD) {} + || exit 0
+
+shellcheck-gencodes: shellcheck-local-gencodes shellcheck-remote-gencodes
+
+shellcheck-types: shellcheck-manifests shellcheck-gencodes
+
+shellcheck: shellcheck-global-explorers shellcheck-types
 
-install-user:
-	python3 setup.py install --user
diff --git a/PKGBUILD.in b/PKGBUILD.in
index c0188e68..c967249d 100755
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -9,7 +9,7 @@ pkgver=$version
 pkgrel=1
 pkgdesc='A Usable Configuration Management System"'
 arch=('any')
-url='https://www.cdi.st/'
+url='http://www.nico.schottelius.org/software/cdist/'
 license=('GPL3')
 depends=('python>=3.2.0')
 source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz")
diff --git a/README b/README
index caf2dac8..a67e25e3 100644
--- a/README
+++ b/README
@@ -3,5 +3,4 @@ cdist
 
 cdist is a usable configuration management system.
 
-For the web documentation have a look at https://www.cdi.st/
-or at docs/src for reStructuredText manual.
+For the web documentation have a look at docs/web/.
diff --git a/README-maintainers b/README-maintainers
deleted file mode 100644
index af57f475..00000000
--- a/README-maintainers
+++ /dev/null
@@ -1,4 +0,0 @@
-Maintainers should use ./bin/build-helper script.
-
-Makefile is intended for end users. It can be used for non-maintaining
-targets that can be run from pure source (without git repository).
diff --git a/bin/build-helper b/bin/build-helper
index 9a776491..ef15b6c2 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
-# 2016-2019 Darko Poljak (darko.poljak at gmail.com)
 #
 # This file is part of cdist.
 #
@@ -19,66 +18,17 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# This file contains the heavy lifting found usually in the Makefile.
+# This file contains the heavy lifting found usually in the Makefile
 #
 
-usage() {
-    printf "usage: %s TARGET [TARGET-ARGS...]
-    Available targets:
-        changelog-changes
-        changelog-version
-        check-date
-        check-unittest
-        ml-release
-        archlinux-release
-        pypi-release
-        release-git-tag
-        sign-git-release
-        release
-        test
-        test-remote
-        pycodestyle
-        pep8
-        check-pycodestyle
-        shellcheck-global-explorers
-        shellcheck-type-explorers
-        shellcheck-manifests
-        shellcheck-local-gencodes
-        shellcheck-remote-gencodes
-        shellcheck-scripts
-        shellcheck-gencodes
-        shellcheck-types
-        shellcheck
-        shellcheck-type-files
-        shellcheck-with-files
-        shellcheck-build-helper
-        check-shellcheck
-        version-branch
-        version
-        target-version
-        clean
-        distclean\n" "$1"
-}
+basedir=${0%/*}/../
+# Change to checkout directory
+cd "$basedir"
 
-basename="${0##*/}"
-
-if [ $# -lt 1 ]
-then
-    usage "${basename}"
-    exit 1
-fi
+version=$(git describe)
 
 option=$1; shift
 
-SHELLCHECKCMD="shellcheck -s sh -f gcc -x"
-# Skip SC2154 for variables starting with __ since such variables are cdist
-# environment variables.
-SHELLCHECK_SKIP=': __.*is referenced but not assigned.*\[SC2154\]'
-
-# Change to checkout directory
-basedir="${0%/*}/../"
-cd "$basedir"
-
 case "$option" in
     changelog-changes)
         if [ "$#" -eq 1 ]; then
@@ -116,8 +66,8 @@ case "$option" in
         date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
 
         if [ "$date_today" != "$date_changelog" ]; then
-            printf "Date in changelog is not today\n"
-            printf "Changelog date: %s\n" "${date_changelog}"
+            echo "Date in changelog is not today"
+            echo "Changelog: $date_changelog"
             exit 1
         fi
     ;;
@@ -126,17 +76,54 @@ case "$option" in
         "$0" test
     ;;
 
+    blog)
+        version=$1; shift
+        blogfile=$1; shift
+        dir=${blogfile%/*}
+        file=${blogfile##*/}
+
+
+        cat << eof > "$blogfile"
+[[!meta title="Cdist $version released"]]
+
+Here's a short overview about the changes found in version ${version}:
+
+eof
+
+        $0 changelog-changes "$version" >> "$blogfile"
+
+        cat << eof >> "$blogfile"
+For more information visit the [[cdist homepage|software/cdist]].
+
+[[!tag cdist config unix]]
+eof
+        cd "$dir"
+        git add "$file"
+        # Allow git commit to fail if there are no changes
+        git commit -m "cdist blog update: $version" "$blogfile" || true
+    ;;
+
     ml-release)
         if [ $# -ne 1 ]; then
-            printf "%s ml-release version\n" "$0" >&2
+            echo "$0 ml-release version" >&2
             exit 1
         fi
 
         version=$1; shift
 
+        to_a=cdist
+        to_d=l.schottelius.org
+        to=${to_a}@${to_d}
+
+        from_a=nico-cdist
+        from_d=schottelius.org
+        from=${from_a}@${from_d}
+
         ( 
         cat << eof
-Subject: cdist $version has been released
+From: Nico -telmich- Schottelius <$from>
+To: cdist mailing list <$to>
+Subject: cdist $version released
 
 Hello .*,
 
@@ -147,41 +134,25 @@ eof
         "$0" changelog-changes "$version"
         cat << eof
 
+Cheers,
+
+Nico
+
+-- 
+Automatisation at its best level. With cdist.
 eof
-        ) > mailinglist.tmp
+        ) | /usr/sbin/sendmail -f "$from" "$to"
     ;;
 
-    archlinux-release)
-        if [ $# -ne 1 ]; then
-            printf "%s archlinux-release version\n" "$0" >&2
-            exit 1
-        fi
-        version=$1; shift
-
-        ARCHLINUXTAR="cdist-${version}-1.src.tar.gz"
-        ./PKGBUILD.in "${version}"
-        umask 022
-        mkaurball
-        burp -c system "${ARCHLINUXTAR}"
-    ;;
-
-    pypi-release)
-        # Ensure that pypi release has the right version
-        "$0" version
-
-        make docs-clean
-        make docs
-        python3 setup.py sdist upload
-    ;;
 
     release-git-tag)
         target_version=$($0 changelog-version)
-        if git rev-parse --verify "refs/tags/${target_version}" 2>/dev/null; then
-            printf "Tag for %s exists, aborting\n" "${target_version}"
+        if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
+            echo "Tag for $target_version exists, aborting"
             exit 1
         fi
-        printf "Enter tag description for %s: " "${target_version}"
-        read -r tagmessage
+        printf "Enter tag description for ${target_version}: "
+        read tagmessage
 
         # setup for signed tags:
         # gpg --fulL-gen-key
@@ -199,8 +170,7 @@ eof
         # gpg --verify <asc-file> <file>
         # gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file>
         # Ensure gpg-agent is running.
-        GPG_TTY=$(tty)
-        export GPG_TTY
+        export GPG_TTY=$(tty)
         gpg-agent
 
         git tag -s "$target_version" -m "$tagmessage"
@@ -210,14 +180,14 @@ eof
     sign-git-release)
         if [ $# -lt 2 ]
         then
-            printf "usage: %s sign-git-release TAG TOKEN [ARCHIVE]\n" "$0"
+            printf "usage: $0 sign-git-release TAG TOKEN [ARCHIVE]\n"
             printf "    if ARCHIVE is not specified then it is created\n"
             exit 1
         fi
         tag="$1"
         if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
         then
-            printf "Tag \"%s\" not found.\n" "${tag}"
+            printf "Tag \"${tag}\" not found.\n"
             exit 1
         fi
         token="$2"
@@ -225,53 +195,44 @@ eof
         then
             archivename="$3"
         else
-            archivename="cdist-${tag}.tar"
+            archivename="cdist-${tag}.tar.gz"
             git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
                 || exit 1
-            # make sure target version is generated
-            "$0" target-version
-            tar -x -f "${archivename}" || exit 1
-            cp cdist/version.py "cdist-${tag}/cdist/version.py" || exit 1
-            tar -c -f "${archivename}" "cdist-${tag}/" || exit 1
-            rm -r -f "cdist-${tag}/"
-            gzip "${archivename}" || exit 1
-            archivename="${archivename}.gz"
         fi
         gpg --armor --detach-sign "${archivename}" || exit 1
 
-        project="ungleich-public%2Fcdist"
-        sed_cmd='s/^.*"markdown":"\([^"]*\)".*$/\1/'
+        # make github release
+        curl -H "Authorization: token ${token}" \
+            --request POST \
+            --data "{ \"tag_name\":\"${tag}\", \
+                      \"target_commitish\":\"master\", \
+                      \"name\": \"${tag}\", \
+                      \"body\":\"${tag}\", \
+                      \"draft\":false, \
+                      \"prerelease\": false}" \
+            "https://api.github.com/repos/ungleich/cdist/releases" || exit 1
 
-        # upload archive
-        response_archive=$(curl -f -X POST \
-             --http1.1 \
-             -H "PRIVATE-TOKEN: ${token}" \
-             -F "file=@${archivename}" \
-             "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
-             | sed "${sed_cmd}") || exit 1
+        # get release ID
+        repoid=$(curl "https://api.github.com/repos/ungleich/cdist/releases/tags/${tag}" \
+            | python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \
+            || exit 1
 
-        # upload archive signature
-        response_archive_sig=$(curl -f -X POST \
-             --http1.1 \
-             -H "PRIVATE-TOKEN: ${token}" \
-             -F "file=@${archivename}.asc" \
-            "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
-             | sed "${sed_cmd}") || exit 1
-
-        # make release
-        changelog=$("$0" changelog-changes "$1" | sed 's/^[[:space:]]*//')
-        release_notes=$(
-            printf "%s\n\n%s\n\n**Changelog**\n\n%s\n" \
-                "${response_archive}" "${response_archive_sig}" "${changelog}"
-        )
-        curl -f -X POST \
-             -H "PRIVATE-TOKEN: ${token}" \
-             -F "description=${release_notes}" \
-            "https://code.ungleich.ch/api/v4/projects/${project}/repository/tags/${tag}/release" \
+        # upload archive and then signature
+        curl -H "Authorization: token ${token}" \
+             -H "Accept: application/vnd.github.manifold-preview" \
+             -H "Content-Type: application/x-gtar" \
+             --data-binary @${archivename} \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}" \
+            || exit 1
+        curl -H "Authorization: token ${token}" \
+             -H "Accept: application/vnd.github.manifold-preview" \
+             -H "Content-Type: application/pgp-signature" \
+             --data-binary @${archivename}.asc \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}.asc" \
             || exit 1
 
         # remove generated files (archive and asc)
-        if [ $# -eq 2 ]
+        if [ $# -eq 2]
         then
             rm -f "${archivename}"
         fi
@@ -283,30 +244,29 @@ eof
         target_version=$($0 changelog-version)
         target_branch=$($0 version-branch)
 
-        printf "Beginning release process for %s\n" "${target_version}"
+        echo "Beginning release process for $target_version"
 
         # First check everything is sane
         "$0" check-date
         "$0" check-unittest
-        "$0" check-pycodestyle
-        "$0" check-shellcheck
+        "$0" check-pep8
 
         # Generate version file to be included in packaging
         "$0" target-version
 
         # Ensure the git status is clean, else abort
         if ! git diff-index --name-only --exit-code HEAD ; then
-            printf "Unclean tree, see files above, aborting.\n"
+            echo "Unclean tree, see files above, aborting"
             exit 1
         fi
 
         # Ensure we are on the master branch
         masterbranch=yes
         if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
-            printf "Releases are happening from the master branch, aborting.\n"
+            echo "Releases are happening from the master branch, aborting"
 
-            printf "Enter the magic word to release anyway:"
-            read -r magicword
+            echo "Enter the magic word to release anyway"
+            read magicword
 
             if [ "$magicword" = "iknowwhatido" ]; then
                 masterbranch=no
@@ -317,7 +277,7 @@ eof
 
         if [ "$masterbranch" = yes ]; then
             # Ensure version branch exists
-            if ! git rev-parse --verify "refs/heads/${target_branch}" 2>/dev/null; then
+            if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
                 git branch "$target_branch"
             fi
 
@@ -335,12 +295,20 @@ eof
         make docs-clean
         make docs
 
+        # Generate speeches (indirect check if they build)
+        make speeches
+
         ############################################################# 
         # Everything green, let's do the release
 
         # Tag the current commit
         "$0" release-git-tag
 
+        # sign git tag
+        printf "Enter github authentication token: "
+        read token
+        "$0" sign-git-release "${target_version}" "${token}"
+
         # Also merge back the version branch
         if [ "$masterbranch" = yes ]; then
             git checkout master
@@ -348,41 +316,41 @@ eof
         fi
 
         # Publish git changes
-        # if you want to have mirror locally then uncomment this and comment below
-        #     git push --mirror
-            git push
-            # push also new branch and set up tracking
-            git push -u origin "${target_branch}"
-        # fi
+        make pub
+
+        # publish man, speeches, website
+        if [ "$masterbranch" = yes ]; then
+            make web-release-all
+        else
+            make web-release-all-no-latest
+        fi
+
+        # Ensure that pypi release has the right version
+        "$0" version
 
         # Create and publish package for pypi
-        "$0" pypi-release
+        make pypi-release
 
-        # sign git tag
-        printf "Enter upstream repository authentication token: "
-        read -r token
-        "$0" sign-git-release "${target_version}" "${token}"
+        # Archlinux release is based on pypi
+        make archlinux-release
 
         # Announce change on ML
-        "$0" ml-release "${target_version}"
+        make ml-release
 
         cat << eof
 Manual steps post release:
-    - cdist-web
-    - send mail body generated in mailinglist.tmp and inform Dmitry for deb
+
+    - linkedin
+    - hackernews
+    - reddit
     - twitter
+
 eof
+
     ;;
 
     test)
-        if [ ! -f "cdist/version.py" ]
-        then
-            printf "cdist/version.py is missing, generate it first.\n"
-            exit 1
-        fi
-
-        PYTHONPATH="$(pwd -P)"
-        export PYTHONPATH
+        export PYTHONPATH="$(pwd -P)"
 
         if [ $# -lt 1 ]; then
             python3 -m cdist.test
@@ -392,30 +360,22 @@ eof
     ;;
 
     test-remote)
-        if [ ! -f "cdist/version.py" ]
-        then
-            printf "cdist/version.py is missing, generate it first.\n"
-            exit 1
-        fi
-
-        PYTHONPATH="$(pwd -P)"
-        export PYTHONPATH
-
+        export PYTHONPATH="$(pwd -P)"
         python3 -m cdist.test.exec.remote
     ;;
 
-    pycodestyle|pep8)
-        pycodestyle "${basedir}" "${basedir}/scripts/cdist" | less
+    pep8)
+        pep8 "${basedir}" "${basedir}/scripts/cdist" | less
     ;;
 
-    check-pycodestyle)
-        "$0" pycodestyle
-        printf "\\nPlease review pycodestyle report.\\n"
+    check-pep8)
+        "$0" pep8
+        echo "Please review pep8 report."
         while true
         do
-            printf "Continue (yes/no)?\n"
+            echo "Continue (yes/no)?"
             any=
-            read -r any
+            read any
             case "$any" in
                 yes)
                     break
@@ -424,83 +384,7 @@ eof
                     exit 1
                 ;;
                 *)
-                    printf "Please answer with 'yes' or 'no' explicitly.\n"
-                ;;
-        esac
-        done
-    ;;
-
-    shellcheck-global-explorers)
-        find cdist/conf/explorer -type f -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-type-explorers)
-        find cdist/conf/type -type f -path "*/explorer/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-manifests)
-        find cdist/conf/type -type f -name manifest -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-local-gencodes)
-        find cdist/conf/type -type f -name gencode-local -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-remote-gencodes)
-        find cdist/conf/type -type f -name gencode-remote -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-scripts)
-        ${SHELLCHECKCMD} scripts/cdist-dump scripts/cdist-new-type || exit 0
-    ;;
-
-    shellcheck-gencodes)
-        "$0" shellcheck-local-gencodes
-        "$0" shellcheck-remote-gencodes
-    ;;
-
-    shellcheck-types)
-        "$0" shellcheck-type-explorers
-        "$0" shellcheck-manifests
-        "$0" shellcheck-gencodes
-    ;;
-
-    shellcheck)
-        "$0" shellcheck-global-explorers
-        "$0" shellcheck-types
-        "$0" shellcheck-scripts
-    ;;
-
-    shellcheck-type-files)
-        find cdist/conf/type -type f -path "*/files/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-with-files)
-        "$0" shellcheck
-        "$0" shellcheck-type-files
-    ;;
-
-    shellcheck-build-helper)
-        ${SHELLCHECKCMD} ./bin/build-helper
-    ;;
-
-    check-shellcheck)
-        "$0" shellcheck
-        printf "\\nPlease review shellcheck report.\\n"
-        while true
-        do
-            printf "Continue (yes/no)?\n"
-            any=
-            read -r any
-            case "$any" in
-                yes)
-                    break
-                ;;
-                no)
-                    exit 1
-                ;;
-                *)
-                    printf "Please answer with 'yes' or 'no' explicitly.\n"
+                    echo "Please answer with 'yes' or 'no' explicitly."
                 ;;
         esac
         done
@@ -511,39 +395,16 @@ eof
     ;;
 
     version)
-        printf "VERSION = \"%s\"\n" "$(git describe)" > cdist/version.py
+        echo "VERSION = \"$(git describe)\"" > cdist/version.py
     ;;
 
     target-version)
         target_version=$($0 changelog-version)
-        printf "VERSION = \"%s\"\n" "${target_version}" > cdist/version.py
+        echo "VERSION = \"${target_version}\"" > cdist/version.py
     ;;
 
-    clean)
-        make clean
-
-        # Archlinux
-        rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
-        rm -rf pkg/ src/
-
-        rm -f MANIFEST PKGBUILD
-        rm -rf dist/
-
-        # Signed release
-        rm -f cdist-*.tar.gz
-        rm -f cdist-*.tar.gz.asc
-
-        # Temp files
-        rm -f ./*.tmp
-    ;;
-
-    distclean)
-        "$0" clean
-        rm -f cdist/version.py
-    ;;
     *)
-        printf "Unknown target: '%s'.\n" "${option}" >&2
-        usage "${basename}"
+        echo "Unknown helper target $@ - aborting"
         exit 1
     ;;
 
diff --git a/bin/build-helper.freebsd b/bin/build-helper.freebsd
new file mode 100755
index 00000000..e49b2f7a
--- /dev/null
+++ b/bin/build-helper.freebsd
@@ -0,0 +1,473 @@
+#!/bin/sh
+#
+# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
+# 2016 Darko Poljak (darko.poljak at gmail.com)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# This file contains the heavy lifting found usually in the Makefile
+#
+
+# vars for make
+helper=$0
+
+basedir=${0%/*}/../
+# run_as is used to check how the script is called (by $0 value)
+# currently supported sufixes for $0 are:
+# .freebsd - run as freebsd
+basename=${0##*/}
+run_as=${basename#*.}
+case "$run_as" in
+    freebsd)
+        to_a=cdist-configuration-management
+        to_d=googlegroups.com
+        from_a=darko.poljak
+        from_d=gmail.com
+        ml_name="Darko Poljak"
+        ml_sig_name="Darko"
+
+        # vars for make
+        WEBDIR=../vcs/www.nico.schottelius.org
+    ;;
+    *)
+        to_a=cdist
+        to_d=l.schottelius.org
+        from_a=nico-cdist
+        from_d=schottelius.org
+        ml_name="Nico -telmich- Schottelius"
+        ml_sig_name="Nico"
+
+        # vars for make
+        WEBDIR=$$HOME/vcs/www.nico.schottelius.org
+    ;;
+esac
+
+# Change to checkout directory
+cd "$basedir"
+
+version=$(git describe)
+
+option=$1; shift
+
+case "$option" in
+    print-make-vars)
+        printf "helper: ${helper}\n"
+        printf "WEBDIR: ${WEBDIR}\n"
+    ;;
+    print-runas)
+        printf "run_as: $run_as\n"
+    ;;
+    changelog-changes)
+        if [ "$#" -eq 1 ]; then
+            start=$1
+        else
+            start="[[:digit:]]"
+        fi
+
+        end="[[:digit:]]"
+
+        awk -F: "BEGIN { start=0 }
+            {
+                if(start == 0) {
+                    if (\$0 ~ /^$start/) {
+                        start = 1
+                    }
+                } else {
+                    if (\$0 ~ /^$end/) {
+                        exit
+                    } else {
+                        print \$0 
+                    }
+                }
+            }" "$basedir/docs/changelog"
+    ;;
+
+    changelog-version)
+        # get version from changelog
+        grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/:.*//'
+    ;;
+
+    check-date)
+        # verify date in changelog is today
+        date_today="$(date +%Y-%m-%d)"
+        date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
+
+        if [ "$date_today" != "$date_changelog" ]; then
+            echo "Date in changelog is not today"
+            echo "Changelog: $date_changelog"
+            exit 1
+        fi
+    ;;
+
+    check-unittest)
+        "$0" test
+    ;;
+
+    blog)
+        version=$1; shift
+        blogfile=$1; shift
+        dir=${blogfile%/*}
+        file=${blogfile##*/}
+
+
+        cat << eof > "$blogfile"
+[[!meta title="Cdist $version released"]]
+
+Here's a short overview about the changes found in version ${version}:
+
+eof
+
+        $0 changelog-changes "$version" >> "$blogfile"
+
+        cat << eof >> "$blogfile"
+For more information visit the [[cdist homepage|software/cdist]].
+
+[[!tag cdist config unix]]
+eof
+        cd "$dir"
+        git add "$file"
+        # Allow git commit to fail if there are no changes
+        git commit -m "cdist blog update: $version" "$blogfile" || true
+    ;;
+
+    ml-release)
+        if [ $# -ne 1 ]; then
+            echo "$0 ml-release version" >&2
+            exit 1
+        fi
+
+        version=$1; shift
+
+        to=${to_a}@${to_d}
+        from=${from_a}@${from_d}
+
+        ( 
+        cat << eof
+From: ${ml_name} <$from>
+To: cdist mailing list <$to>
+Subject: cdist $version released
+
+Hello .*,
+
+cdist $version has been released with the following changes:
+
+eof
+
+        "$0" changelog-changes "$version"
+        cat << eof
+
+Cheers,
+
+${ml_sig_name}
+
+-- 
+Automatisation at its best level. With cdist.
+eof
+        ) | /usr/sbin/sendmail -f "$from" "$to"
+    ;;
+
+    release-git-tag)
+        target_version=$($0 changelog-version)
+        if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
+            echo "Tag for $target_version exists, aborting"
+            exit 1
+        fi
+        printf "Enter tag description for ${target_version}: "
+        read tagmessage
+
+        # setup for signed tags:
+        # gpg --fulL-gen-key
+        # gpg --list-secret-keys --keyid-format LONG
+        # git config --local user.signingkey <id>
+        # for exporting pub key:
+        #     gpg --armor --export <id> > pubkey.asc
+        #     gpg --output pubkey.gpg --export <id>
+        # show tag with signature
+        # git show <tag>
+        # verify tag signature
+        # git tag -v <tag>
+        #
+        # gpg verify signature
+        # gpg --verify <asc-file> <file>
+        # gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file>
+        # Ensure gpg-agent is running.
+        export GPG_TTY=$(tty)
+        gpg-agent
+
+        git tag -s "$target_version" -m "$tagmessage"
+        git push --tags
+    ;;
+
+    sign-git-release)
+        if [ $# -lt 2 ]
+        then
+            printf "usage: $0 sign-git-release TAG TOKEN [ARCHIVE]\n"
+            printf "    if ARCHIVE is not specified then it is created\n"
+            exit 1
+        fi
+        tag="$1"
+        if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
+        then
+            printf "Tag \"${tag}\" not found.\n"
+            exit 1
+        fi
+        token="$2"
+        if [ $# -gt 2 ]
+        then
+            archivename="$3"
+        else
+            archivename="cdist-${tag}.tar.gz"
+            git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
+                || exit 1
+        fi
+        gpg --armor --detach-sign "${archivename}" || exit 1
+
+        # make github release
+        curl -H "Authorization: token ${token}" \
+            --request POST \
+            --data "{ \"tag_name\":\"${tag}\", \
+                      \"target_commitish\":\"master\", \
+                      \"name\": \"${tag}\", \
+                      \"body\":\"${tag}\", \
+                      \"draft\":false, \
+                      \"prerelease\": false}" \
+            "https://api.github.com/repos/ungleich/cdist/releases" || exit 1
+
+        # get release ID
+        repoid=$(curl "https://api.github.com/repos/ungleich/cdist/releases/tags/${tag}" \
+            | python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \
+            || exit 1
+
+        # upload archive and then signature
+        curl -H "Authorization: token ${token}" \
+             -H "Accept: application/vnd.github.manifold-preview" \
+             -H "Content-Type: application/x-gtar" \
+             --data-binary @${archivename} \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}" \
+            || exit 1
+        curl -H "Authorization: token ${token}" \
+             -H "Accept: application/vnd.github.manifold-preview" \
+             -H "Content-Type: application/pgp-signature" \
+             --data-binary @${archivename}.asc \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}.asc" \
+            || exit 1
+
+        # remove generated files (archive and asc)
+        if [ $# -eq 2]
+        then
+            rm -f "${archivename}"
+        fi
+        rm -f "${archivename}.asc"
+    ;;
+
+    release)
+        set -e
+        target_version=$($0 changelog-version)
+        target_branch=$($0 version-branch)
+
+        echo "Beginning release process for $target_version"
+
+        # First check everything is sane
+        "$0" check-date
+        "$0" check-unittest
+        "$0" check-pep8
+
+        # Generate version file to be included in packaging
+        "$0" target-version
+
+        # Ensure the git status is clean, else abort
+        if ! git diff-index --name-only --exit-code HEAD ; then
+            echo "Unclean tree, see files above, aborting"
+            exit 1
+        fi
+
+        # Ensure we are on the master branch
+        masterbranch=yes
+        if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
+            echo "Releases are happening from the master branch, aborting"
+
+            echo "Enter the magic word to release anyway"
+            read magicword
+
+            if [ "$magicword" = "iknowwhatido" ]; then
+                masterbranch=no
+            else
+                exit 1
+            fi
+        fi
+
+        if [ "$masterbranch" = yes ]; then
+            # Ensure version branch exists
+            if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
+                git branch "$target_branch"
+            fi
+
+            # Merge master branch into version branch
+            git checkout "$target_branch"
+            git merge master
+        fi
+
+        # Verify that after the merge everything works
+        "$0" check-date
+        "$0" check-unittest
+
+        # Generate documentation (man and html)
+        # First, clean old generated docs
+        make helper=${helper} WEBDIR=${WEBDIR} docs-clean
+        make helper=${helper} WEBDIR=${WEBDIR} docs
+
+        # Generate speeches (indirect check if they build)
+        make helper=${helper} WEBDIR=${WEBDIR} speeches
+
+        ############################################################# 
+        # Everything green, let's do the release
+
+        # Tag the current commit
+        "$0" release-git-tag
+
+        # sign git tag
+        printf "Enter github authentication token: "
+        read token
+        "$0" sign-git-release "${target_version}" "${token}"
+
+        # Also merge back the version branch
+        if [ "$masterbranch" = yes ]; then
+            git checkout master
+            git merge "$target_branch"
+        fi
+
+        # Publish git changes
+        case "$run_as" in
+            freebsd)
+                # if we are not Nico :) then just push, no mirror
+                git push
+                # push also new branch and set up tracking
+                git push -u origin "${target_branch}"
+            ;;
+            *)
+                make helper=${helper} WEBDIR=${WEBDIR} pub
+            ;;
+        esac
+
+        # publish man, speeches, website
+        if [ "$masterbranch" = yes ]; then
+            make helper=${helper} WEBDIR=${WEBDIR} web-release-all
+        else
+            make helper=${helper} WEBDIR=${WEBDIR} web-release-all-no-latest
+        fi
+
+        # Ensure that pypi release has the right version
+        "$0" version
+
+        # Create and publish package for pypi
+        make helper=${helper} WEBDIR=${WEBDIR} pypi-release
+
+        case "$run_as" in
+            freebsd)
+            ;;
+            *)
+                # Archlinux release is based on pypi
+                make archlinux-release
+            ;;
+        esac
+
+        # Announce change on ML
+        make helper=${helper} WEBDIR=${WEBDIR} ml-release
+
+        cat << eof
+Manual steps post release:
+
+    - linkedin
+    - hackernews
+    - reddit
+    - twitter
+
+eof
+
+        case "$run_as" in
+            freebsd)
+                cat <<eof
+Additional steps post release:
+    - archlinux release
+eof
+            ;;
+            *)
+            ;;
+        esac
+
+    ;;
+
+    test)
+        export PYTHONPATH="$(pwd -P)"
+
+        if [ $# -lt 1 ]; then
+            python3 -m cdist.test
+        else
+            python3 -m unittest "$@"
+        fi
+    ;;
+
+    test-remote)
+        export PYTHONPATH="$(pwd -P)"
+        python3 -m cdist.test.exec.remote
+    ;;
+
+    pep8)
+        pep8 "${basedir}" "${basedir}/scripts/cdist" | less
+    ;;
+
+    check-pep8)
+        "$0" pep8
+        echo "Please review pep8 report."
+        while true
+        do
+            echo "Continue (yes/no)?"
+            any=
+            read any
+            case "$any" in
+                yes)
+                    break
+                ;;
+                no)
+                    exit 1
+                ;;
+                *)
+                    echo "Please answer with 'yes' or 'no' explicitly."
+                ;;
+        esac
+        done
+    ;;
+
+    version-branch)
+        "$0" changelog-version | cut -d. -f '1,2'
+    ;;
+
+    version)
+        echo "VERSION = \"$(git describe)\"" > cdist/version.py
+    ;;
+
+    target-version)
+        target_version=$($0 changelog-version)
+        echo "VERSION = \"${target_version}\"" > cdist/version.py
+    ;;
+
+    *)
+        echo "Unknown helper target $@ - aborting"
+        exit 1
+    ;;
+
+esac
diff --git a/cdist/__init__.py b/cdist/__init__.py
index c673b3ba..000a571c 100644
--- a/cdist/__init__.py
+++ b/cdist/__init__.py
@@ -181,40 +181,17 @@ class CdistObjectError(CdistEntityError):
                          params, stdout_paths, stderr_paths, subject)
 
 
-class CdistObjectExplorerError(CdistEntityError):
-    """
-    Something went wrong while working on a specific
-    cdist object explorer
-    """
-    def __init__(self, cdist_object, explorer_name, explorer_path,
-                 stderr_path, subject=''):
-        params = [
-            ('object name', cdist_object.name, ),
-            ('object path', cdist_object.absolute_path, ),
-            ('object source', " ".join(cdist_object.source), ),
-            ('object type', os.path.realpath(
-                cdist_object.cdist_type.absolute_path), ),
-            ('explorer name', explorer_name, ),
-            ('explorer path', explorer_path, ),
-        ]
-        stdout_paths = []
-        stderr_paths = [
-            ('remote', stderr_path, ),
-        ]
-        super().__init__("explorer '{}' of object '{}'".format(
-            explorer_name, cdist_object.name), params, stdout_paths,
-            stderr_paths, subject)
-
-
 class InitialManifestError(CdistEntityError):
     """Something went wrong while executing initial manifest"""
     def __init__(self, initial_manifest, stdout_path, stderr_path, subject=''):
         params = [
             ('path', initial_manifest, ),
         ]
+        stdout_paths = []
         stdout_paths = [
             ('init', stdout_path, ),
         ]
+        stderr_paths = []
         stderr_paths = [
             ('init', stderr_path, ),
         ]
@@ -222,20 +199,6 @@ class InitialManifestError(CdistEntityError):
                          stderr_paths, subject)
 
 
-class GlobalExplorerError(CdistEntityError):
-    """Something went wrong while executing global explorer"""
-    def __init__(self, name, path, stderr_path, subject=''):
-        params = [
-            ('name', name, ),
-            ('path', path, ),
-        ]
-        stderr_paths = [
-            ('remote', stderr_path, ),
-        ]
-        super().__init__("global explorer '{}'".format(name),
-                         params, [], stderr_paths, subject)
-
-
 def file_to_list(filename):
     """Return list from \n seperated file"""
     if os.path.isfile(filename):
diff --git a/cdist/argparse.py b/cdist/argparse.py
index 421d1b54..0ee9d7b1 100644
--- a/cdist/argparse.py
+++ b/cdist/argparse.py
@@ -11,9 +11,9 @@ import cdist.configuration
 BETA_COMMANDS = set(('install', 'inventory', ))
 # set of beta arguments for sub-commands
 BETA_ARGS = {
-    'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )),
+    'config': set(('jobs', 'tag', 'all_tagged_hosts', 'use_archiving', )),
 }
-EPILOG = "Get cdist at https://code.ungleich.ch/ungleich-public/cdist"
+EPILOG = "Get cdist at http://www.nico.schottelius.org/software/cdist/"
 # Parser others can reuse
 parser = None
 
@@ -161,16 +161,6 @@ def get_parsers():
 
     # Config
     parser['config_main'] = argparse.ArgumentParser(add_help=False)
-    parser['config_main'].add_argument(
-           '-4', '--force-ipv4',
-           help=('Force to use IPv4 addresses only. No influence for custom'
-                 ' remote commands.'),
-           action='store_const', dest='force_ipv', const=4)
-    parser['config_main'].add_argument(
-           '-6', '--force-ipv6',
-           help=('Force to use IPv6 addresses only. No influence for custom'
-                 ' remote commands.'),
-           action='store_const', dest='force_ipv', const=6)
     parser['config_main'].add_argument(
             '-C', '--cache-path-pattern',
             help=('Specify custom cache path pattern. If '
@@ -191,7 +181,8 @@ def get_parsers():
                                   name="positive int"),
            help=('Operate in parallel in specified maximum number of jobs. '
                  'Global explorers, object prepare and object run are '
-                 'supported. Without argument CPU count is used by default. '),
+                 'supported. Without argument CPU count is used by default. '
+                 'Currently in beta.'),
            action='store', dest='jobs',
            const=multiprocessing.cpu_count())
     parser['config_main'].add_argument(
@@ -200,11 +191,6 @@ def get_parsers():
     parser['config_main'].add_argument(
            '-o', '--out-dir',
            help='Directory to save cdist output in.', dest="out_path")
-    parser['config_main'].add_argument(
-           '-P', '--timestamp',
-           help=('Timestamp log messages with the current local date and time '
-                 'in the format: YYYYMMDDHHMMSS.us.'),
-           action='store_true', dest='timestamp')
     parser['config_main'].add_argument(
            '-R', '--use-archiving', nargs='?',
            choices=('tar', 'tgz', 'tbz2', 'txz',),
@@ -234,13 +220,19 @@ def get_parsers():
                  '(should behave like ssh).'),
            action='store', dest='remote_exec',
            default=None)
-    parser['config_main'].add_argument(
-           '-S', '--disable-saving-output-streams',
-           help='Disable saving output streams.',
-           action='store_false', dest='save_output_streams', default=True)
 
     # Config
     parser['config_args'] = argparse.ArgumentParser(add_help=False)
+    parser['config_args'].add_argument(
+           '-4', '--force-ipv4',
+           help=('Force to use IPv4 addresses only. No influence for custom'
+                 ' remote commands.'),
+           action='store_const', dest='force_ipv', const=4)
+    parser['config_args'].add_argument(
+           '-6', '--force-ipv6',
+           help=('Force to use IPv6 addresses only. No influence for custom'
+                 ' remote commands.'),
+           action='store_const', dest='force_ipv', const=6)
     parser['config_args'].add_argument(
              '-A', '--all-tagged',
              help=('Use all hosts present in tags db. Currently in beta.'),
@@ -250,6 +242,8 @@ def get_parsers():
              help=('List hosts that have all specified tags, '
                    'if -t/--tag is specified.'),
              action="store_true", dest="has_all_tags", default=False)
+    parser['config_args'].add_argument(
+            'host', nargs='*', help='Host(s) to operate on.')
     parser['config_args'].add_argument(
             '-f', '--file',
             help=('Read specified file for a list of additional hosts to '
@@ -257,6 +251,11 @@ def get_parsers():
                   'line). If no host or host file is specified then, by '
                   'default, read hosts from stdin.'),
             dest='hostfile', required=False)
+    parser['config_args'].add_argument(
+           '-P', '--timestamp',
+           help=('Timestamp log messages with the current local date and time '
+                 'in the format: YYYYMMDDHHMMSS.us.'),
+           action='store_true', dest='timestamp')
     parser['config_args'].add_argument(
            '-p', '--parallel', nargs='?', metavar='HOST_MAX',
            type=functools.partial(check_lower_bounded_int, lower_bound=1,
@@ -266,6 +265,10 @@ def get_parsers():
                  'default.'),
            action='store', dest='parallel',
            const=multiprocessing.cpu_count())
+    parser['config_args'].add_argument(
+           '-S', '--disable-saving-output-streams',
+           help='Disable saving output streams.',
+           action='store_false', dest='save_output_streams', default=True)
     parser['config_args'].add_argument(
            '-s', '--sequential',
            help='Operate on multiple hosts sequentially (default).',
@@ -276,8 +279,6 @@ def get_parsers():
                    'list all hosts that contain any of specified tags. '
                    'Currently in beta.'),
              dest='tag', required=False, action="store_true", default=False)
-    parser['config_args'].add_argument(
-            'host', nargs='*', help='Host(s) to operate on.')
     parser['config'] = parser['sub'].add_parser(
             'config', parents=[parser['loglevel'], parser['beta'],
                                parser['common'],
diff --git a/cdist/conf/explorer/cpu_cores b/cdist/conf/explorer/cpu_cores
index a52bddac..27cc6800 100755
--- a/cdist/conf/explorer/cpu_cores
+++ b/cdist/conf/explorer/cpu_cores
@@ -28,10 +28,6 @@ case "$os" in
         sysctl -n hw.physicalcpu
     ;;
 
-    "openbsd")
-        sysctl -n hw.ncpuonline
-    ;;
-
     *)
         if [ -r /proc/cpuinfo ]; then
             cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
diff --git a/cdist/conf/explorer/cpu_sockets b/cdist/conf/explorer/cpu_sockets
index a32e2f00..1e75182b 100755
--- a/cdist/conf/explorer/cpu_sockets
+++ b/cdist/conf/explorer/cpu_sockets
@@ -25,14 +25,14 @@
 os=$("$__explorer/os")
 case "$os" in
     "macosx")
-        system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}'
+        system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F ': ' '/Number of Processors/ {print $2}'
     ;;
 
     *)
     if [ -r /proc/cpuinfo ]; then
-        sockets="$(grep "physical id" /proc/cpuinfo | sort -u | wc -l)"
+        sockets=$(grep "physical id" /proc/cpuinfo | sort -u | wc -l)
         if [ "${sockets}" -eq 0 ]; then
-            sockets="$(grep -c "processor" /proc/cpuinfo)"
+            sockets=$(grep -cE "^processor\s+:" /proc/cpuinfo)
         fi
         echo "${sockets}"
     fi
diff --git a/cdist/conf/explorer/disks b/cdist/conf/explorer/disks
old mode 100755
new mode 100644
index 87a6b5c6..25dfa5ad
--- a/cdist/conf/explorer/disks
+++ b/cdist/conf/explorer/disks
@@ -1,27 +1,2 @@
-#!/bin/sh
-
-uname_s="$(uname -s)"
-
-case "${uname_s}" in
-    FreeBSD)
-        sysctl -n kern.disks
-    ;;
-    OpenBSD|NetBSD)
-        sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+' | xargs
-    ;;
-    Linux)
-        if command -v lsblk > /dev/null
-        then
-            # exclude ram disks, floppies and cdroms
-            # https://www.kernel.org/doc/Documentation/admin-guide/devices.txt
-            lsblk -e 1,2,11 -dno name | xargs
-        else
-            printf "Don't know how to list disks for %s operating system without lsblk, if you can please submit a patch\n" "${uname_s}" >&2
-        fi
-    ;;
-    *)
-        printf "Don't know how to list disks for %s operating system, if you can please submit a patch\n" "${uname_s}" >&2
-    ;;
-esac
-
-exit 0
+cd /dev || exit 0
+echo sd? hd? vd?
diff --git a/cdist/conf/explorer/init b/cdist/conf/explorer/init
index a8a7857e..43a66a50 100755
--- a/cdist/conf/explorer/init
+++ b/cdist/conf/explorer/init
@@ -29,7 +29,7 @@ case "$uname_s" in
     Linux)
         (pgrep -P0 -l | awk '/^1[ \t]/ {print $2;}') || true
     ;;
-    FreeBSD|OpenBSD)
+    FreeBSD)
         ps -o comm= -p 1 || true
     ;;
     *)
diff --git a/cdist/conf/explorer/interfaces b/cdist/conf/explorer/interfaces
index 55287971..c1f2a57a 100755
--- a/cdist/conf/explorer/interfaces
+++ b/cdist/conf/explorer/interfaces
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
 #
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
+# 2012 Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
 #
 # This file is part of cdist.
 #
@@ -17,14 +17,35 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
+#
+# List all network interfaces in explorer/ifaces. One interface per line.
+#
+# If your OS is not supported please provide a ifconfig output
+#
 
-if command -v ip > /dev/null
-then
+# Use ip, if available
+if command -v ip >/dev/null; then
     ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
-
-elif command -v ifconfig > /dev/null
-then
-    ifconfig -a \
-        | sed -n -E 's/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p' \
-        | sort -u
+    exit 0
 fi
+
+if ! command -v ifconfig >/dev/null; then
+   # no ifconfig, nothing we could do
+   exit 0
+fi
+
+uname_s="$(uname -s)"
+REGEXP='s/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p'
+
+case "$uname_s" in
+    Darwin)
+	ifconfig -a | sed -n -E "$REGEXP"
+	;;
+    Linux|*BSD)
+	ifconfig -a | sed -n -r "$REGEXP"
+	;;
+    *)
+	echo "Unsupported ifconfig output for $uname_s" >&2
+	exit 1
+	;;
+esac
diff --git a/cdist/conf/explorer/is-freebsd-jail b/cdist/conf/explorer/is-freebsd-jail
old mode 100755
new mode 100644
index 010917f5..a6d11d1a
--- a/cdist/conf/explorer/is-freebsd-jail
+++ b/cdist/conf/explorer/is-freebsd-jail
@@ -1,2 +1 @@
-#!/bin/sh
 sysctl -n security.jail.jailed 2>/dev/null | grep "1" || true
diff --git a/cdist/conf/explorer/kernel_name b/cdist/conf/explorer/kernel_name
old mode 100755
new mode 100644
index 1f9cfca4..98ebac2a
--- a/cdist/conf/explorer/kernel_name
+++ b/cdist/conf/explorer/kernel_name
@@ -1,2 +1 @@
-#!/bin/sh
 uname -s
diff --git a/cdist/conf/explorer/lsb_codename b/cdist/conf/explorer/lsb_codename
index 26bb8e3d..d27c48a9 100755
--- a/cdist/conf/explorer/lsb_codename
+++ b/cdist/conf/explorer/lsb_codename
@@ -20,9 +20,8 @@
 #
 
 set +e
-case "$("$__explorer/os")" in
+case "$("${__explorer}"/os)" in
    openwrt)
-      # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_CODENAME")
    ;;
    *)
diff --git a/cdist/conf/explorer/lsb_description b/cdist/conf/explorer/lsb_description
index b1009627..d435d0e2 100755
--- a/cdist/conf/explorer/lsb_description
+++ b/cdist/conf/explorer/lsb_description
@@ -20,9 +20,8 @@
 #
 
 set +e
-case "$("$__explorer/os")" in
+case "$("${__explorer}"/os)" in
    openwrt)
-      # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_DESCRIPTION")
    ;;
    *)
diff --git a/cdist/conf/explorer/lsb_id b/cdist/conf/explorer/lsb_id
index 82ff9977..6a249412 100755
--- a/cdist/conf/explorer/lsb_id
+++ b/cdist/conf/explorer/lsb_id
@@ -20,9 +20,8 @@
 #
 
 set +e
-case "$("$__explorer/os")" in
+case "$("${__explorer}"/os)" in
    openwrt)
-      # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_ID")
    ;;
    *)
diff --git a/cdist/conf/explorer/lsb_release b/cdist/conf/explorer/lsb_release
index 5ebfff1a..fee3c050 100755
--- a/cdist/conf/explorer/lsb_release
+++ b/cdist/conf/explorer/lsb_release
@@ -20,9 +20,8 @@
 #
 
 set +e
-case "$("$__explorer/os")" in
+case "$("${__explorer}"/os)" in
    openwrt)
-      # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_RELEASE")
    ;;
    *)
diff --git a/cdist/conf/explorer/machine b/cdist/conf/explorer/machine
index 7ecb67e3..080867ac 100755
--- a/cdist/conf/explorer/machine
+++ b/cdist/conf/explorer/machine
@@ -22,6 +22,6 @@
 #
 #
 
-if command -v uname >/dev/null 2>&1 ; then
+if command -v uname > /dev/null 2>&1; then
    uname -m
 fi
diff --git a/cdist/conf/explorer/os_version b/cdist/conf/explorer/os_version
index 4c41695b..2012257b 100755
--- a/cdist/conf/explorer/os_version
+++ b/cdist/conf/explorer/os_version
@@ -22,7 +22,7 @@
 #
 #
 
-case "$("$__explorer/os")" in
+case "$("${__explorer}"/os)" in
    amazon)
       cat /etc/system-release
    ;;
diff --git a/cdist/conf/type/__acl/explorer/acl_is b/cdist/conf/type/__acl/explorer/acl_is
index a693c023..4dc98c51 100755
--- a/cdist/conf/type/__acl/explorer/acl_is
+++ b/cdist/conf/type/__acl/explorer/acl_is
@@ -18,14 +18,6 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-[ ! -e "/$__object_id" ] && exit 0
-
-if ! command -v getfacl > /dev/null
-then
-    echo 'getfacl not available' >&2
-    exit 1
+if [ -e "/$__object_id" ]
+then getfacl "/$__object_id" | grep -E '^((default:|)(user|group)):[a-z]' || true
 fi
-
-getfacl "/$__object_id" 2>/dev/null \
-    | grep -Eo '^(default:)?(user|group|(mask|other):):[^:][[:graph:]]+' \
-    || true
diff --git a/cdist/conf/type/__acl/explorer/checks b/cdist/conf/type/__acl/explorer/checks
deleted file mode 100755
index 70bb0412..00000000
--- a/cdist/conf/type/__acl/explorer/checks
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# TODO check if filesystem has ACL turned on etc
-
-if [ -f "$__object/parameter/acl" ]
-then
-    grep -E '^(default:)?(user|group):' "$__object/parameter/acl" \
-    | while read -r acl
-    do
-        param="$( echo "$acl" | awk -F: '{print $(NF-2)}' )"
-        check="$( echo "$acl" | awk -F: '{print $(NF-1)}' )"
-
-        [ "$param" = 'user' ] && db=passwd || db="$param"
-
-        if ! getent "$db" "$check" > /dev/null
-        then
-            echo "missing $param '$check'" >&2
-            exit 1
-        fi
-    done
-fi
diff --git a/cdist/conf/type/__acl/gencode-remote b/cdist/conf/type/__acl/gencode-remote
index 6dab4d09..a59d49e0 100755
--- a/cdist/conf/type/__acl/gencode-remote
+++ b/cdist/conf/type/__acl/gencode-remote
@@ -18,67 +18,32 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-file_is="$( cat "$__object/explorer/file_is" )"
-
-[ "$file_is" = 'missing' ] && [ -z "$__cdist_dry_run" ] && exit 0
-
 os="$( cat "$__global/explorer/os" )"
 
 acl_path="/$__object_id"
 
 acl_is="$( cat "$__object/explorer/acl_is" )"
 
-if [ -f "$__object/parameter/acl" ]
-then
-    acl_should="$( cat "$__object/parameter/acl" )"
-elif
-    [ -f "$__object/parameter/user" ] \
-        || [ -f "$__object/parameter/group" ] \
-        || [ -f "$__object/parameter/mask" ] \
-        || [ -f "$__object/parameter/other" ]
-then
-    acl_should="$( for param in user group mask other
+acl_should="$( for parameter in user group
+do
+    if [ ! -f "$__object/parameter/$parameter" ]
+    then continue
+    fi
+    while read -r l
     do
-        [ ! -f "$__object/parameter/$param" ] && continue
+        echo "$parameter:$l"
 
-        echo "$param" | grep -Eq 'mask|other' && sep=:: || sep=:
-
-        echo "$param$sep$( cat "$__object/parameter/$param" )"
-    done )"
-else
-    echo 'no parameters set' >&2
-    exit 1
-fi
-
-if [ -f "$__object/parameter/default" ]
-then
-    acl_should="$( echo "$acl_should" \
-        | sed 's/^default://' \
-        | sort -u \
-        | sed 's/\(.*\)/default:\1\n\1/' )"
-fi
-
-if [ "$file_is" = 'regular' ] \
-    && echo "$acl_should" | grep -Eq '^default:'
-then
-    # only directories can have default ACLs,
-    # but instead of error,
-    # let's just remove default entries
-    acl_should="$( echo "$acl_should" | grep -Ev '^default:' )"
-fi
-
-if echo "$acl_should" | awk -F: '{ print $NF }' | grep -Fq 'X'
-then
-    [ "$file_is" = 'directory' ] && rep=x || rep=-
-
-    acl_should="$( echo "$acl_should" | sed "s/\\(.*\\)X/\\1$rep/" )"
-fi
+        if [ -f "$__object/parameter/default" ]
+        then echo "default:$parameter:$l"
+        fi
+    done < "$__object/parameter/$parameter"
+done )"
 
 setfacl_exec='setfacl'
 
 if [ -f "$__object/parameter/recursive" ]
 then
-    if echo "$os" | grep -Fq 'freebsd'
+    if echo "$os" | grep -E 'macosx|netbsd|freebsd|openbsd'
     then
         echo "$os setfacl do not support recursive operations" >&2
     else
@@ -88,39 +53,29 @@ fi
 
 if [ -f "$__object/parameter/remove" ]
 then
-    echo "$acl_is" | while read -r acl
-    do
-        # skip wanted ACL entries which already exist
-        # and skip mask and other entries, because we
-        # can't actually remove them, but only change.
-        if echo "$acl_should" | grep -Eq "^$acl" \
-            || echo "$acl" | grep -Eq '^(default:)?(mask|other)'
-        then continue
-        fi
+    if echo "$os" | grep 'solaris'
+    then
+        # Solaris setfacl behaves differently.
+        # We will not support Solaris for now, because no way to test it.
+        # But adding support should be easy (use -s instead of -m on modify).
+        echo "$os setfacl do not support -x flag for ACL remove" >&2
+    else
+        echo "$acl_is" | while read -r acl
+        do
+            if echo "$acl_should" | grep -Fq "$acl"
+            then continue
+            fi
 
-        if echo "$os" | grep -Fq 'freebsd'
-        then
-            remove="$acl"
-        else
-            remove="$( echo "$acl" | sed 's/:...$//' )"
-        fi
+            no_bits="$( echo "$acl" | sed -r 's/:[rwx-]+$//' )"
 
-        echo "$setfacl_exec -x \"$remove\" \"$acl_path\""
-        echo "removed '$remove'" >> "$__messages_out"
-    done
+            echo "$setfacl_exec -x \"$no_bits\" \"$acl_path\""
+        done
+    fi
 fi
 
 for acl in $acl_should
 do
     if ! echo "$acl_is" | grep -Eq "^$acl"
-    then
-        if echo "$os" | grep -Fq 'freebsd' \
-            && echo "$acl" | grep -Eq '^default:'
-        then
-            echo "setting default ACL in $os is currently not supported" >&2
-        else
-            echo "$setfacl_exec -m \"$acl\" \"$acl_path\""
-            echo "added '$acl'" >> "$__messages_out"
-        fi
+    then echo "$setfacl_exec -m \"$acl\" \"$acl_path\""
     fi
 done
diff --git a/cdist/conf/type/__acl/man.rst b/cdist/conf/type/__acl/man.rst
index 85e946ce..39db4d75 100644
--- a/cdist/conf/type/__acl/man.rst
+++ b/cdist/conf/type/__acl/man.rst
@@ -3,41 +3,35 @@ cdist-type__acl(7)
 
 NAME
 ----
-cdist-type__acl - Set ACL entries
+cdist-type__acl - Basic wrapper around `setfacl`
 
 
 DESCRIPTION
 -----------
-Fully supported and tested on Linux (ext4 filesystem), partial support for FreeBSD.
+ACL must be defined as 3-symbol combination, using `r`, `w`, `x` and `-`.
 
-See ``setfacl`` and ``acl`` manpages for more details.
+See setfacl(1) and acl(5) for more details.
 
 
-REQUIRED MULTIPLE PARAMETERS
+OPTIONAL MULTIPLE PARAMETERS
 ----------------------------
-acl
-   Set ACL entry following ``getfacl`` output syntax.
+user
+   Add user ACL entry.
+
+group
+   Add group ACL entry.
 
 
 BOOLEAN PARAMETERS
 ------------------
-default
-   Set all ACL entries as default too.
-   Only directories can have default ACLs.
-   Setting default ACL in FreeBSD is currently not supported.
-
 recursive
-   Make ``setfacl`` recursive (Linux only), but not ``getfacl`` in explorer.
+   Operate recursively (Linux only).
+
+default
+   Add default ACL entries.
 
 remove
-   Remove undefined ACL entries.
-   ``mask`` and ``other`` entries can't be removed, but only changed.
-
-
-DEPRECATED PARAMETERS
----------------------
-Parameters ``user``, ``group``, ``mask`` and ``other`` are deprecated and they
-will be removed in future versions. Please use ``acl`` parameter instead.
+   Remove undefined ACL entries (Solaris not supported).
 
 
 EXAMPLES
@@ -46,30 +40,13 @@ EXAMPLES
 .. code-block:: sh
 
     __acl /srv/project \
-        --default \
         --recursive \
-        --remove \
-        --acl user:alice:rwx \
-        --acl user:bob:r-x \
-        --acl group:project-group:rwx \
-        --acl group:some-other-group:r-x \
-        --acl mask::r-x \
-        --acl other::r-x
-
-    # give Alice read-only access to subdir,
-    # but don't allow her to see parent content.
-
-    __acl /srv/project2 \
-        --remove \
-        --acl default:group:secret-project:rwx \
-        --acl group:secret-project:rwx \
-        --acl user:alice:--x
-
-    __acl /srv/project2/subdir \
         --default \
         --remove \
-        --acl group:secret-project:rwx \
-        --acl user:alice:r-x
+        --user alice:rwx \
+        --user bob:r-x \
+        --group project-group:rwx \
+        --group some-other-group:r-x
 
 
 AUTHORS
diff --git a/cdist/conf/type/__acl/parameter/deprecated/group b/cdist/conf/type/__acl/parameter/deprecated/group
deleted file mode 100644
index 94e14159..00000000
--- a/cdist/conf/type/__acl/parameter/deprecated/group
+++ /dev/null
@@ -1 +0,0 @@
-see manual for details
diff --git a/cdist/conf/type/__acl/parameter/deprecated/mask b/cdist/conf/type/__acl/parameter/deprecated/mask
deleted file mode 100644
index 94e14159..00000000
--- a/cdist/conf/type/__acl/parameter/deprecated/mask
+++ /dev/null
@@ -1 +0,0 @@
-see manual for details
diff --git a/cdist/conf/type/__acl/parameter/deprecated/other b/cdist/conf/type/__acl/parameter/deprecated/other
deleted file mode 100644
index 94e14159..00000000
--- a/cdist/conf/type/__acl/parameter/deprecated/other
+++ /dev/null
@@ -1 +0,0 @@
-see manual for details
diff --git a/cdist/conf/type/__acl/parameter/deprecated/user b/cdist/conf/type/__acl/parameter/deprecated/user
deleted file mode 100644
index 94e14159..00000000
--- a/cdist/conf/type/__acl/parameter/deprecated/user
+++ /dev/null
@@ -1 +0,0 @@
-see manual for details
diff --git a/cdist/conf/type/__acl/parameter/optional b/cdist/conf/type/__acl/parameter/optional
deleted file mode 100644
index 4b32086b..00000000
--- a/cdist/conf/type/__acl/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-mask
-other
diff --git a/cdist/conf/type/__acl/parameter/optional_multiple b/cdist/conf/type/__acl/parameter/optional_multiple
index 95c25d55..22f5a52c 100644
--- a/cdist/conf/type/__acl/parameter/optional_multiple
+++ b/cdist/conf/type/__acl/parameter/optional_multiple
@@ -1,3 +1,2 @@
-acl
 user
 group
diff --git a/cdist/conf/type/__apt_key/explorer/state b/cdist/conf/type/__apt_key/explorer/state
index 38f1bd3c..f7940741 100755
--- a/cdist/conf/type/__apt_key/explorer/state
+++ b/cdist/conf/type/__apt_key/explorer/state
@@ -27,18 +27,6 @@ else
    keyid="$__object_id"
 fi
 
-keydir="$(cat "$__object/parameter/keydir")"
-keyfile="$keydir/$__object_id.gpg"
-
-if [ -d "$keydir" ]
-then
-   if [ -f "$keyfile" ]
-   then echo present
-   else echo absent
-   fi
-else
-   # fallback to deprecated apt-key
-   apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
-      && echo present \
-      || echo absent
-fi
+apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
+   && echo present \
+   || echo absent
diff --git a/cdist/conf/type/__apt_key/gencode-remote b/cdist/conf/type/__apt_key/gencode-remote
index 47c8bb49..66494466 100755
--- a/cdist/conf/type/__apt_key/gencode-remote
+++ b/cdist/conf/type/__apt_key/gencode-remote
@@ -31,84 +31,12 @@ if [ "$state_should" = "$state_is" ]; then
    exit 0
 fi
 
-keydir="$(cat "$__object/parameter/keydir")"
-keyfile="$keydir/$__object_id.gpg"
-
 case "$state_should" in
    present)
       keyserver="$(cat "$__object/parameter/keyserver")"
-
-      if [ -f "$__object/parameter/uri" ]; then
-         uri="$(cat "$__object/parameter/uri")"
-
-         if [ -d "$keydir" ]; then
-            cat << EOF
-
-curl -s -L \\
-    -o "$keyfile" \\
-    "$uri"
-
-if grep -Fq 'BEGIN PGP PUBLIC KEY BLOCK' \\
-    "$keyfile"
-then
-    cat "$keyfile" \\
-        | gpg --export > "$keyfile"
-fi
-
-EOF
-         else
-            # fallback to deprecated apt-key
-            echo "curl -s -L '$uri' | apt-key add -"
-         fi
-      elif [ -d "$keydir" ]; then
-         tmp='/tmp/cdist_apt_key_tmp'
-
-         # we need to kill gpg after 30 seconds, because gpg
-         # can get stuck if keyserver is not responding.
-         # exporting env var and not exit 1,
-         # because we need to clean up and kill dirmngr.
-         cat << EOF
-
-mkdir -m 700 -p "$tmp"
-
-if timeout 30s \\
-    gpg --homedir "$tmp" \\
-        --keyserver "$keyserver" \\
-        --recv-keys "$keyid"
-then
-    gpg --homedir "$tmp" \\
-        --export "$keyid" \\
-        > "$keyfile"
-else
-    export GPG_GOT_STUCK=1
-fi
-
-GNUPGHOME="$tmp" gpgconf --kill dirmngr
-
-rm -rf "$tmp"
-
-if [ -n "\$GPG_GOT_STUCK" ]
-then
-    echo "GPG GOT STUCK - no response from keyserver after 30 seconds" >&2
-    exit 1
-fi
-
-EOF
-      else
-         # fallback to deprecated apt-key
-         echo "apt-key adv --keyserver \"$keyserver\" --recv-keys \"$keyid\""
-      fi
-
-      echo "added '$keyid'" >> "$__messages_out"
+      echo "apt-key adv --keyserver '$keyserver' --recv-keys '$keyid'"
    ;;
    absent)
-      if [ -f "$keyfile" ]; then
-         echo "rm '$keyfile'"
-      else
-         # fallback to deprecated apt-key
-         echo "apt-key del \"$keyid\""
-      fi
-
-      echo "removed '$keyid'" >> "$__messages_out"
+      echo "apt-key del '$keyid'"
    ;;
 esac
diff --git a/cdist/conf/type/__apt_key/man.rst b/cdist/conf/type/__apt_key/man.rst
index 234bc715..9009877e 100644
--- a/cdist/conf/type/__apt_key/man.rst
+++ b/cdist/conf/type/__apt_key/man.rst
@@ -28,12 +28,6 @@ keyserver
    the keyserver from which to fetch the key. If omitted the default set
    in ./parameter/default/keyserver is used.
 
-keydir
-   key save location, defaults to ``/etc/apt/trusted.pgp.d``
-
-uri
-   the URI from which to download the key
-
 
 EXAMPLES
 --------
@@ -53,20 +47,15 @@ EXAMPLES
     # same thing with other keyserver
     __apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com
 
-    # download key from the internet
-    __apt_key rabbitmq \
-       --uri http://www.rabbitmq.com/rabbitmq-signing-key-public.asc
-
 
 AUTHORS
 -------
 Steven Armstrong <steven-cdist--@--armstrong.cc>
-Ander Punnar <ander-at-kvlt-dot-ee>
 
 
 COPYING
 -------
-Copyright \(C) 2011-2019 Steven Armstrong and Ander Punnar. You can
-redistribute it and/or modify it under the terms of the GNU General Public
-License as published by the Free Software Foundation, either version 3 of the
+Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
 License, or (at your option) any later version.
diff --git a/cdist/conf/type/__apt_key/manifest b/cdist/conf/type/__apt_key/manifest
deleted file mode 100755
index 010357cd..00000000
--- a/cdist/conf/type/__apt_key/manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-__package gnupg
-
-if [ -f "$__object/parameter/uri" ]
-then __package curl
-else __package dirmngr
-fi
diff --git a/cdist/conf/type/__apt_key/parameter/default/keydir b/cdist/conf/type/__apt_key/parameter/default/keydir
deleted file mode 100644
index 190eb2de..00000000
--- a/cdist/conf/type/__apt_key/parameter/default/keydir
+++ /dev/null
@@ -1 +0,0 @@
-/etc/apt/trusted.gpg.d
diff --git a/cdist/conf/type/__apt_key/parameter/optional b/cdist/conf/type/__apt_key/parameter/optional
index de647375..18cf2586 100644
--- a/cdist/conf/type/__apt_key/parameter/optional
+++ b/cdist/conf/type/__apt_key/parameter/optional
@@ -1,5 +1,3 @@
 state
 keyid
 keyserver
-keydir
-uri
diff --git a/cdist/conf/type/__apt_ppa/explorer/state b/cdist/conf/type/__apt_ppa/explorer/state
index d47e7d20..2bb4f65a 100755
--- a/cdist/conf/type/__apt_ppa/explorer/state
+++ b/cdist/conf/type/__apt_ppa/explorer/state
@@ -23,11 +23,10 @@
 
 name="$__object_id"
 
-# shellcheck disable=SC1091
 . /etc/lsb-release
 
 repo_name="${name#ppa:}"
-repo_file_name="$(echo "$repo_name" | sed -e 's|[/:]|-|' -e 's|\.|_|')-${DISTRIB_CODENAME}.list"
+repo_file_name="$(echo "$repo_name" | sed -e "s|[/:]|-|" -e "s|\.|_|")-${DISTRIB_CODENAME}.list"
 
 [ -s "/etc/apt/sources.list.d/${repo_file_name}" ] \
    && echo present || echo absent
diff --git a/cdist/conf/type/__apt_ppa/manifest b/cdist/conf/type/__apt_ppa/manifest
index c6f4e876..7d637ad4 100755
--- a/cdist/conf/type/__apt_ppa/manifest
+++ b/cdist/conf/type/__apt_ppa/manifest
@@ -18,6 +18,8 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
+# name="$__object_id"
+
 __package software-properties-common
 
 require="__package/software-properties-common" \
diff --git a/cdist/conf/type/__block/gencode-remote b/cdist/conf/type/__block/gencode-remote
index 1f5cc033..f269c785 100755
--- a/cdist/conf/type/__block/gencode-remote
+++ b/cdist/conf/type/__block/gencode-remote
@@ -18,11 +18,6 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-# quote function from http://www.etalabs.net/sh_tricks.html
-quote() {
-   printf '%s\n' "$1" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/'/"
-}
-
 file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
 state_should=$(cat "$__object/parameter/state")
 prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
@@ -51,7 +46,7 @@ tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
 if [ -f "$file" ]; then
    cp -p "$file" "\$tmpfile"
 fi
-awk -v prefix=^$(quote "$prefix")\$ -v suffix=^$(quote "$suffix")\$ '
+awk -v prefix="^$prefix\$" -v suffix="^$suffix\$" '
 {
    if (match(\$0,prefix)) {
       triggered=1
diff --git a/cdist/conf/type/__block/manifest b/cdist/conf/type/__block/manifest
index 726950d3..191b857e 100755
--- a/cdist/conf/type/__block/manifest
+++ b/cdist/conf/type/__block/manifest
@@ -18,6 +18,8 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
+
+# file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
 prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
 suffix=$(cat "$__object/parameter/suffix" 2>/dev/null || echo "#/cdist:__block/$__object_id")
 text=$(cat "$__object/parameter/text")
diff --git a/cdist/conf/type/__ccollect_source/gencode-remote b/cdist/conf/type/__ccollect_source/gencode-remote
index 57353c24..d22a0394 100755
--- a/cdist/conf/type/__ccollect_source/gencode-remote
+++ b/cdist/conf/type/__ccollect_source/gencode-remote
@@ -43,17 +43,17 @@ get_current_value() {
 
 set_group() {
     echo "chgrp '$1' '$destination'"
-    echo "chgrp '$1'" >> "$__messages_out"
+    echo "chgrp $1" >> "$__messages_out"
 }
 
 set_owner() {
     echo "chown '$1' '$destination'"
-    echo "chown '$1'" >> "$__messages_out"
+    echo "chown $1" >> "$__messages_out"
 }
 
 set_mode() {
    echo "chmod '$1' '$destination'"
-   echo "chmod '$1'" >> "$__messages_out"
+   echo "chmod $1" >> "$__messages_out"
 }
 
 case "$state_should" in
diff --git a/cdist/conf/type/__ccollect_source/manifest b/cdist/conf/type/__ccollect_source/manifest
index 727a4c97..b3694722 100755
--- a/cdist/conf/type/__ccollect_source/manifest
+++ b/cdist/conf/type/__ccollect_source/manifest
@@ -22,7 +22,7 @@ name="$__object_id"
 state="$(cat "$__object/parameter/state")"
 source="$(cat "$__object/parameter/source")"
 destination="$(cat "$__object/parameter/destination")"
-ccollectconf="$(sed 's,/$,,' "$__object/parameter/ccollectconf")"
+ccollectconf="$(sed -E 's,/+$,,' "$__object/parameter/ccollectconf")"
 
 sourcedir="$ccollectconf/sources"
 basedir="$sourcedir/$name"
@@ -55,5 +55,5 @@ if [ -f "$__object/parameter/exclude" ]; then
 fi
 
 if [ -f "$__object/parameter/create-destination" ]; then
-    __directory "${destination}" --parents --state "${state}"
+    __directory "${destination}" --parents --state ${state}
 fi
diff --git a/cdist/conf/type/__cdist/man.rst b/cdist/conf/type/__cdist/man.rst
index be082781..9e1c72cb 100644
--- a/cdist/conf/type/__cdist/man.rst
+++ b/cdist/conf/type/__cdist/man.rst
@@ -30,7 +30,7 @@ username
 
 source
     Select the source from which to clone cdist from.
-    Defaults to "git@code.ungleich.ch:ungleich-public/cdist.git".
+    Defaults to "git://github.com/ungleich/cdist.git".
 
 
 branch
@@ -47,7 +47,7 @@ EXAMPLES
     __cdist /home/cdist/cdist
 
     # Use alternative source
-    __cdist --source "git@code.ungleich.ch:ungleich-public/cdist.git" /home/cdist/cdist
+    __cdist --source "git://github.com/ungleich/cdist" /home/cdist/cdist
 
 
 AUTHORS
diff --git a/cdist/conf/type/__cdist/parameter/default/source b/cdist/conf/type/__cdist/parameter/default/source
index 1ad3a250..3f8e31ad 100644
--- a/cdist/conf/type/__cdist/parameter/default/source
+++ b/cdist/conf/type/__cdist/parameter/default/source
@@ -1 +1 @@
-git@code.ungleich.ch:ungleich-public/cdist.git
+git://github.com/ungleich/cdist.git
diff --git a/cdist/conf/type/__check_messages/gencode-remote b/cdist/conf/type/__check_messages/gencode-remote
deleted file mode 100755
index ec36cecc..00000000
--- a/cdist/conf/type/__check_messages/gencode-remote
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-if grep -Eq \
-    "$( cat "$__object/parameter/pattern" )" \
-    "$__messages_in"
-then
-    tee "$__messages_out" < "$__object/parameter/execute"
-fi
diff --git a/cdist/conf/type/__check_messages/man.rst b/cdist/conf/type/__check_messages/man.rst
deleted file mode 100644
index 5c80a0ae..00000000
--- a/cdist/conf/type/__check_messages/man.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-cdist-type__check_messages(7)
-=============================
-
-NAME
-----
-cdist-type__check_messages - Check messages for pattern and execute command on match.
-
-
-DESCRIPTION
------------
-Check messages for pattern and execute command on match.
-
-This type is useful if you chain together multiple related types using
-dependencies and want to restart service if at least one type changes
-something.
-
-For more information about messages see `cdist messaging <cdist-messaging.html>`_.
-
-For more information about dependencies and execution order see
-`cdist manifest <cdist-manifest.html#dependencies>`_ documentation.
-
-
-REQUIRED PARAMETERS
--------------------
-pattern
-   Extended regular expression pattern for search (passed to ``grep -E``).
-
-execute
-   Command to execute on pattern match.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    __check_messages munin \
-        --pattern '^__(file|link|line)/etc/munin/' \
-        --execute 'service munin-node restart'
-
-
-AUTHORS
--------
-Ander Punnar <ander-at-kvlt-dot-ee>
-
-
-COPYING
--------
-Copyright \(C) 2019 Ander Punnar. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__check_messages/parameter/required b/cdist/conf/type/__check_messages/parameter/required
deleted file mode 100644
index 374363cb..00000000
--- a/cdist/conf/type/__check_messages/parameter/required
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern
-execute
diff --git a/cdist/conf/type/__clean_path/explorer/list b/cdist/conf/type/__clean_path/explorer/list
deleted file mode 100755
index 07d38127..00000000
--- a/cdist/conf/type/__clean_path/explorer/list
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-path="/$__object_id"
-
-[ ! -d "$path" ] && exit 0
-
-pattern="$( cat "$__object/parameter/pattern" )"
-
-if [ -f "$__object/parameter/exclude" ]
-then
-    exclude="$( cat "$__object/parameter/exclude" )"
-
-    find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern" \
-        -and -not -regex "$exclude"
-else
-    find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern"
-fi
diff --git a/cdist/conf/type/__clean_path/gencode-remote b/cdist/conf/type/__clean_path/gencode-remote
deleted file mode 100755
index 998a70d8..00000000
--- a/cdist/conf/type/__clean_path/gencode-remote
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-[ ! -s "$__object/explorer/list" ] && exit 0
-
-path="/$__object_id"
-
-pattern="$( cat "$__object/parameter/pattern" )"
-
-if [ -f "$__object/parameter/exclude" ]
-then
-    exclude="$( cat "$__object/parameter/exclude" )"
-
-    echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
-        "-and -not -regex '$exclude'" \
-        '-exec rm -rf {} \;'
-else
-    echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
-        '-exec rm -rf {} \;'
-fi
-
-while read -r f
-do
-    echo "removed '$f'" >> "$__messages_out"
-done \
-< "$__object/explorer/list"
-
-if [ -f "$__object/parameter/onchange" ]
-then
-    cat "$__object/parameter/onchange"
-fi
diff --git a/cdist/conf/type/__clean_path/man.rst b/cdist/conf/type/__clean_path/man.rst
deleted file mode 100644
index 826f4589..00000000
--- a/cdist/conf/type/__clean_path/man.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-cdist-type__clean_path(7)
-=========================
-
-NAME
-----
-cdist-type__clean_path - Remove files and directories which match the pattern.
-
-
-DESCRIPTION
------------
-Remove files and directories which match the pattern.
-
-Provided path (as __object_id) must be a directory.
-
-Patterns are passed to ``find``'s ``-regex`` - see ``find(1)`` for more details.
-
-Look up of files and directories is non-recursive (``-maxdepth 1``).
-
-Parent directory is excluded (``-mindepth 1``).
-
-This type is not POSIX compatible (sorry, Solaris users).
-
-
-REQUIRED PARAMETERS
--------------------
-pattern
-   Pattern of files which are removed from path.
-
-
-OPTIONAL PARAMETERS
--------------------
-exclude
-   Pattern of files which are excluded from removal.
-
-onchange
-   The code to run if files or directories were removed.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    __clean_path /etc/apache2/conf-enabled \
-        --pattern '.+' \
-        --exclude '.+\(charset\.conf\|security\.conf\)' \
-        --onchange 'service apache2 restart'
-
-
-AUTHORS
--------
-Ander Punnar <ander-at-kvlt-dot-ee>
-
-
-COPYING
--------
-Copyright \(C) 2019 Ander Punnar. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__clean_path/parameter/optional b/cdist/conf/type/__clean_path/parameter/optional
deleted file mode 100644
index 6f313474..00000000
--- a/cdist/conf/type/__clean_path/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-exclude
-onchange
diff --git a/cdist/conf/type/__clean_path/parameter/required b/cdist/conf/type/__clean_path/parameter/required
deleted file mode 100644
index 54774947..00000000
--- a/cdist/conf/type/__clean_path/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-pattern
diff --git a/cdist/conf/type/__config_file/manifest b/cdist/conf/type/__config_file/manifest
index be8f9f67..3155f79b 100755
--- a/cdist/conf/type/__config_file/manifest
+++ b/cdist/conf/type/__config_file/manifest
@@ -19,8 +19,7 @@
 #
 
 set -- "/${__object_id}"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       source)
          source="$(cat "$__object/parameter/source")"
diff --git a/cdist/conf/type/__consul/files/versions/1.2.3/cksum b/cdist/conf/type/__consul/files/versions/1.2.3/cksum
deleted file mode 100644
index 6352409e..00000000
--- a/cdist/conf/type/__consul/files/versions/1.2.3/cksum
+++ /dev/null
@@ -1 +0,0 @@
-191982 110369685
diff --git a/cdist/conf/type/__consul/files/versions/1.2.3/source b/cdist/conf/type/__consul/files/versions/1.2.3/source
deleted file mode 100644
index 5e67bc37..00000000
--- a/cdist/conf/type/__consul/files/versions/1.2.3/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.2.3/consul_1.2.3_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/1.3.0/cksum b/cdist/conf/type/__consul/files/versions/1.3.0/cksum
deleted file mode 100644
index 7a885378..00000000
--- a/cdist/conf/type/__consul/files/versions/1.3.0/cksum
+++ /dev/null
@@ -1 +0,0 @@
-1714523667 98363467 consul
diff --git a/cdist/conf/type/__consul/files/versions/1.3.0/source b/cdist/conf/type/__consul/files/versions/1.3.0/source
deleted file mode 100644
index 18a1ba8e..00000000
--- a/cdist/conf/type/__consul/files/versions/1.3.0/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.3.0/consul_1.3.0_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/1.5.0/cksum b/cdist/conf/type/__consul/files/versions/1.5.0/cksum
deleted file mode 100644
index efca9caa..00000000
--- a/cdist/conf/type/__consul/files/versions/1.5.0/cksum
+++ /dev/null
@@ -1 +0,0 @@
-886614099 103959898 consul
diff --git a/cdist/conf/type/__consul/files/versions/1.5.0/source b/cdist/conf/type/__consul/files/versions/1.5.0/source
deleted file mode 100644
index cafa9248..00000000
--- a/cdist/conf/type/__consul/files/versions/1.5.0/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.5.0/consul_1.5.0_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/gencode-remote b/cdist/conf/type/__consul/gencode-remote
index 2a21054f..22e9eea1 100755
--- a/cdist/conf/type/__consul/gencode-remote
+++ b/cdist/conf/type/__consul/gencode-remote
@@ -39,10 +39,10 @@ version_dir="$versions_dir/$version"
 
 source=$(cat "$version_dir/source")
 source_file_name="${source##*/}"
-cksum_should=$(cut -d' ' -f1,2 "$version_dir/cksum")
+cksum_should=$(cat "$version_dir/cksum" | cut -d' ' -f1,2)
 
 cat << eof
-    tmpdir=\$(mktemp -d -p /tmp "${__type##*/}.XXXXXXXXXX")
+    tmpdir=\$(mktemp -d --tmpdir="/tmp" "${__type##*/}.XXXXXXXXXX")
     curl -s -L "$source" > "\$tmpdir/$source_file_name"
     unzip -p "\$tmpdir/$source_file_name" > "${destination}.tmp"
     rm -rf "\$tmpdir"
diff --git a/cdist/conf/type/__consul/manifest b/cdist/conf/type/__consul/manifest
index 156eb667..0dd50f53 100755
--- a/cdist/conf/type/__consul/manifest
+++ b/cdist/conf/type/__consul/manifest
@@ -24,7 +24,7 @@
 os=$(cat "$__global/explorer/os")
 
 case "$os" in
-   alpine|scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
+   scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
       # any linux should work
       :
    ;;
@@ -47,7 +47,6 @@ fi
 
 if [ -f "$__object/parameter/direct" ]; then
     __package unzip
-    __package curl
 else
     __staged_file /usr/local/bin/consul \
        --source "$(cat "$version_dir/source")" \
diff --git a/cdist/conf/type/__consul_agent/files/consul.sys-openrc b/cdist/conf/type/__consul_agent/files/consul.sys-openrc
deleted file mode 100644
index 1dbe9375..00000000
--- a/cdist/conf/type/__consul_agent/files/consul.sys-openrc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
-
-description="consul agent"
-
-pidfile="${CONSUL_PIDFILE:-"/var/run/$RC_SVCNAME/pidfile"}"
-command="${CONSUL_BINARY:-"/usr/local/bin/consul"}"
-
-
-checkconfig() {
-	if [ ! -d /var/run/consul ] ; then
-		mkdir -p /var/run/consul || return 1
-        chown consul:consul /var/run/$NAME || return 1
-        chmod 2770 /var/run/$NAME || return 1
-	fi
-}
-
-start() {
-    need net
-
-    start-stop-daemon --start --quiet --oknodo \
-            --pidfile "$pidfile" --background \
-            --exec $command -- agent -pid-file="$pidfile" -config-dir /etc/consul/conf.d
-}
-start_pre() {
-	checkconfig
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping $RC_SVCNAME"
-	start-stop-daemon --stop --exec "$command" \
-		--pidfile "$pidfile" --quiet
-	eend $?
-}
diff --git a/cdist/conf/type/__consul_agent/files/consul.sysv-debian b/cdist/conf/type/__consul_agent/files/consul.sysv-debian
index 4f43c000..098328b3 100644
--- a/cdist/conf/type/__consul_agent/files/consul.sysv-debian
+++ b/cdist/conf/type/__consul_agent/files/consul.sysv-debian
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2015-2018 Nico Schottelius (nico-cdist at schottelius.org)
+# 2015 Nico Schottelius (nico-cdist at schottelius.org)
 # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
@@ -24,18 +24,15 @@
 # Required-Stop:     $local_fs
 # Should-Start:
 # Should-Stop:
-# Short-Description: consul
-# Description:       consul agent
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
+# Short-Description: libvirt management daemon
 ### END INIT INFO
 
 if [ -f "/etc/default/consul" ]; then
-    # shellcheck disable=SC1091
     . /etc/default/consul
 fi
 
-# shellcheck disable=SC1091
 . /lib/lsb/init-functions
 
 NAME=consul
diff --git a/cdist/conf/type/__consul_agent/files/consul.sysv-redhat b/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
index 58fc9bd9..13dafd2e 100644
--- a/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
+++ b/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
@@ -11,52 +11,49 @@
 # pidfile: /var/run/consul/pidfile
 
 # Source function library.
-
-# shellcheck disable=SC1091
 . /etc/init.d/functions
 NAME=consul
 CONSUL=/usr/local/bin/consul
-CONFIG="/etc/$NAME/conf.d"
-PID_FILE="/var/run/$NAME/pidfile"
-LOG_FILE="/var/log/$NAME"
+CONFIG=/etc/$NAME/conf.d
+PID_FILE=/var/run/$NAME/pidfile
+LOG_FILE=/var/log/$NAME
 
-# shellcheck disable=SC1090
-[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME"
-export GOMAXPROCS="${GOMAXPROCS:-2}"
+[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+export GOMAXPROCS=${GOMAXPROCS:-2}
 
-mkdir -p "/var/run/$NAME"
-chown consul:consul "/var/run/$NAME"
-chmod 2770 "/var/run/$NAME"
+mkdir -p /var/run/$NAME
+chown consul:consul /var/run/$NAME
+chmod 2770 /var/run/$NAME
 
 
 start() {
-   printf "Starting %s: " "$NAME"
+   echo -n "Starting $NAME: "
    daemon --user=consul \
       --pidfile="$PID_FILE" \
       "$CONSUL" agent -pid-file="$PID_FILE" -config-dir "$CONFIG" >> "$LOG_FILE" &
    retcode=$?
-   touch "/var/lock/subsys/$NAME"
-   return "$retcode"
+   touch /var/lock/subsys/$NAME
+   return $retcode
 }
 
 stop() {
-   printf "Shutting down %s: " "$NAME"
-   killproc -p "$PID_FILE" "$NAME"
+   echo -n "Shutting down $NAME: "
+   killproc -p "$PID_FILE" $NAME
    retcode=$?
-   rm -f "/var/lock/subsys/$NAME"
-   return "$retcode"
+   rm -f /var/lock/subsys/$NAME
+   return $retcode
 }
 
 case "$1" in
    start)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          echo "$NAME already running"
       else
          start
       fi
    ;;
    stop)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          stop
       else
          echo "$NAME not running"
@@ -66,25 +63,25 @@ case "$1" in
       "$CONSUL" info
    ;;
    status)
-      status -p "$PID_FILE" "$NAME"
+      status -p "$PID_FILE" $NAME
       exit $?
    ;;
    restart)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          stop
       fi
       start
    ;;
    reload)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
-         kill -HUP "$(cat "$PID_FILE")"
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
+         kill -HUP `cat $PID_FILE`
       else
          echo "$NAME not running"
       fi
    ;;
    condrestart)
-      if [ -f "/var/lock/subsys/$NAME" ]; then
-         if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if [ -f /var/lock/subsys/$NAME ]; then
+         if $(status -p "$PID_FILE" $NAME >/dev/null); then
             stop
          fi
          start
diff --git a/cdist/conf/type/__consul_agent/manifest b/cdist/conf/type/__consul_agent/manifest
index a88d26ed..a696894b 100755
--- a/cdist/conf/type/__consul_agent/manifest
+++ b/cdist/conf/type/__consul_agent/manifest
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 #
 # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2015-2019 Nico Schottelius (nico-cdist at schottelius.org)
+# 2015 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -23,7 +23,7 @@
 os=$(cat "$__global/explorer/os")
 
 case "$os" in
-   alpine|scientific|centos|debian|devuan|redhat|ubuntu)
+   scientific|centos|debian|devuan|redhat|ubuntu)
       # whitelist safeguard
       :
    ;;
@@ -84,8 +84,7 @@ echo "{"
 # parameters we define ourself
 printf '   "data_dir": "%s"\n' "$data_dir"
 
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state|user|group|json-config) continue ;;
       ca-file-source|cert-file-source|key-file-source)
@@ -181,25 +180,22 @@ init_upstart()
 
 # Install init script to start on boot
 case "$os" in
-    alpine|devuan)
-        init_sysvinit debian
-        ;;
-    centos|redhat)
-        os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")"
-        major_version="${os_version%%.*}"
-        case "$major_version" in
-            [456])
-                init_sysvinit redhat
-                ;;
-            7)
-                init_systemd
-                ;;
-            *)
-                echo "Unsupported CentOS/Redhat version: $os_version" >&2
-                exit 1
-                ;;
-        esac
-        ;;
+   centos|redhat)
+      os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")"
+      major_version="${os_version%%.*}"
+      case "$major_version" in
+         [456])
+            init_sysvinit redhat
+         ;;
+         7)
+            init_systemd
+         ;;
+         *)
+            echo "Unsupported CentOS/Redhat version: $os_version" >&2
+            exit 1
+         ;;
+      esac
+   ;;
 
     debian)
         os_version=$(cat "$__global/explorer/os_version")
@@ -209,7 +205,7 @@ case "$os" in
             [567])
                 init_sysvinit debian
             ;;
-            [89])
+            8)
                 init_systemd
             ;;
             *)
@@ -217,9 +213,13 @@ case "$os" in
                 exit 1
             ;;
         esac
-        ;;
+    ;;
+
+    devuan)
+        init_sysvinit debian
+    ;;
 
     ubuntu)
         init_upstart
-        ;;
+    ;;
 esac
diff --git a/cdist/conf/type/__consul_check/manifest b/cdist/conf/type/__consul_check/manifest
index c9f7add9..554c0680 100755
--- a/cdist/conf/type/__consul_check/manifest
+++ b/cdist/conf/type/__consul_check/manifest
@@ -50,8 +50,7 @@ fi
 echo "{"
 printf '   "check": {\n'
 printf '      "name": "%s"\n' "$name"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state|name) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_service/manifest b/cdist/conf/type/__consul_service/manifest
index 60397db7..f6d29b4a 100755
--- a/cdist/conf/type/__consul_service/manifest
+++ b/cdist/conf/type/__consul_service/manifest
@@ -42,8 +42,7 @@ fi
 echo "{"
 printf '   "service": {\n'
 printf '      "name": "%s"\n' "$name"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state|name|check-interval) continue ;;
       check-script)
diff --git a/cdist/conf/type/__consul_template/files/consul-template.sysv b/cdist/conf/type/__consul_template/files/consul-template.sysv
index b263915a..0a463020 100644
--- a/cdist/conf/type/__consul_template/files/consul-template.sysv
+++ b/cdist/conf/type/__consul_template/files/consul-template.sysv
@@ -10,75 +10,72 @@
 # pidfile: /var/run/consul-template/pidfile
 
 # Source function library.
-
-# shellcheck disable=SC1091
 . /etc/init.d/functions
 NAME=consul-template
 CONSUL_TEMPLATE=/usr/local/bin/consul-template
-CONFIG="/etc/$NAME/conf.d"
-PID_FILE="/var/run/$NAME/pidfile"
-LOG_FILE="/var/log/$NAME"
+CONFIG=/etc/$NAME/conf.d
+PID_FILE=/var/run/$NAME/pidfile
+LOG_FILE=/var/log/$NAME
 
-# shellcheck disable=SC1090
-[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME"
-export CONSUL_TEMPLATE_LOG="${CONSUL_TEMPLATE_LOG:-info}"
-export GOMAXPROCS="${GOMAXPROCS:-2}"
+[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+export CONSUL_TEMPLATE_LOG=${CONSUL_TEMPLATE_LOG:-info}
+export GOMAXPROCS=${GOMAXPROCS:-2}
 
-mkdir -p "/var/run/$NAME"
+mkdir -p /var/run/$NAME
 
 start() {
-   printf "Starting %s: " "$NAME"
+   echo -n "Starting $NAME: "
    daemon --pidfile="$PID_FILE" \
       "$CONSUL_TEMPLATE" -config "$CONFIG" >> "$LOG_FILE" 2>&1 &
-   echo "$!" > "$PID_FILE"
+   echo $! > "$PID_FILE"
    retcode=$?
-   touch "/var/lock/subsys/$NAME"
-   return "$retcode"
+   touch /var/lock/subsys/$NAME
+   return $retcode
 }
 
 stop() {
-   printf "Shutting down %s: " "$NAME"
-   killproc -p "$PID_FILE" "$CONSUL_TEMPLATE"
+   echo -n "Shutting down $NAME: "
+   killproc -p $PID_FILE $CONSUL_TEMPLATE
    retcode=$?
-   rm -f "/var/lock/subsys/$NAME"
-   return "$retcode"
+   rm -f /var/lock/subsys/$NAME
+   return $retcode
 }
 
 case "$1" in
    start)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          echo "$NAME already running"
       else
          start
       fi
    ;;
    stop)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          stop
       else
          echo "$NAME not running"
       fi
    ;;
    status)
-      status -p "$PID_FILE" "$NAME"
+      status -p "$PID_FILE" $NAME
       exit $?
    ;;
    restart)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          stop
       fi
       start
    ;;
    reload)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
-          kill -HUP "$(cat "$PID_FILE")"
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
+         kill -HUP `cat $PID_FILE`
       else
          echo "$NAME not running"
       fi
    ;;
    condrestart)
-      if [ -f "/var/lock/subsys/$NAME" ]; then
-         if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if [ -f /var/lock/subsys/$NAME ]; then
+         if $(status -p "$PID_FILE" $NAME >/dev/null); then
             stop
          fi
          start
diff --git a/cdist/conf/type/__consul_template/manifest b/cdist/conf/type/__consul_template/manifest
index b02fc332..2236e5bd 100755
--- a/cdist/conf/type/__consul_template/manifest
+++ b/cdist/conf/type/__consul_template/manifest
@@ -75,8 +75,7 @@ require="__directory/etc/consul-template" \
 
 # Generate hcl config file
 (
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       auth-password|state|ssl-*|syslog-*|version|vault-token|vault-ssl*) continue ;;
       auth-username)
diff --git a/cdist/conf/type/__consul_template_template/manifest b/cdist/conf/type/__consul_template_template/manifest
index 1eae1fad..488a0f5d 100755
--- a/cdist/conf/type/__consul_template_template/manifest
+++ b/cdist/conf/type/__consul_template_template/manifest
@@ -35,27 +35,23 @@ if [ ! -f "$__object/parameter/source" ] && [ ! -f "$__object/parameter/source-f
    exit 1
 fi
 
-if [ -f "$__object/parameter/source-file" ]; then
-    destination="${template_dir}/${name}"
-    require="__file${destination}"
-fi
-
 # Generate hcl config file
-{
+(
 printf 'template {\n'
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       source-file)
          source="$(cat "$__object/parameter/$param")"
          if [ "$source" = "-" ]; then
             source="$__object/stdin"
          fi
+         destination="${template_dir}/${name}"
          require="__directory${template_dir}" \
             __file "$destination" \
                --owner root --group root --mode 640 \
                --source "$source" \
                --state "$state"
+         export require="__file${destination}"
          printf '   source = "%s"\n' "$destination"
 
       ;;
@@ -69,7 +65,7 @@ for param in *; do
    esac
 done
 printf '}\n'
-} | \
+) | \
 require="$require __directory${conf_dir}" \
    __config_file "${conf_dir}/${conf_file}" \
       --owner root --group root --mode 640 \
diff --git a/cdist/conf/type/__consul_watch_checks/manifest b/cdist/conf/type/__consul_watch_checks/manifest
index 5fdd7a74..146f609e 100755
--- a/cdist/conf/type/__consul_watch_checks/manifest
+++ b/cdist/conf/type/__consul_watch_checks/manifest
@@ -35,8 +35,7 @@ fi
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state) continue ;;
       filter-*)
diff --git a/cdist/conf/type/__consul_watch_event/manifest b/cdist/conf/type/__consul_watch_event/manifest
index 61934656..099054a5 100755
--- a/cdist/conf/type/__consul_watch_event/manifest
+++ b/cdist/conf/type/__consul_watch_event/manifest
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_watch_key/manifest b/cdist/conf/type/__consul_watch_key/manifest
index 61934656..099054a5 100755
--- a/cdist/conf/type/__consul_watch_key/manifest
+++ b/cdist/conf/type/__consul_watch_key/manifest
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_watch_keyprefix/manifest b/cdist/conf/type/__consul_watch_keyprefix/manifest
index 61934656..099054a5 100755
--- a/cdist/conf/type/__consul_watch_keyprefix/manifest
+++ b/cdist/conf/type/__consul_watch_keyprefix/manifest
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_watch_nodes/manifest b/cdist/conf/type/__consul_watch_nodes/manifest
index 61934656..099054a5 100755
--- a/cdist/conf/type/__consul_watch_nodes/manifest
+++ b/cdist/conf/type/__consul_watch_nodes/manifest
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__consul_watch_service/manifest b/cdist/conf/type/__consul_watch_service/manifest
index db38eb18..2825c716 100755
--- a/cdist/conf/type/__consul_watch_service/manifest
+++ b/cdist/conf/type/__consul_watch_service/manifest
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state) continue ;;
       passingonly)
diff --git a/cdist/conf/type/__consul_watch_services/manifest b/cdist/conf/type/__consul_watch_services/manifest
index 61934656..099054a5 100755
--- a/cdist/conf/type/__consul_watch_services/manifest
+++ b/cdist/conf/type/__consul_watch_services/manifest
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
    case "$param" in
       state) continue ;;
       *)
diff --git a/cdist/conf/type/__cron/gencode-remote b/cdist/conf/type/__cron/gencode-remote
index 59398058..2045ae6d 100755
--- a/cdist/conf/type/__cron/gencode-remote
+++ b/cdist/conf/type/__cron/gencode-remote
@@ -58,9 +58,9 @@ state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
 # These are the old markers
 prefix="#cdist:__cron/$__object_id"
 suffix="#/cdist:__cron/$__object_id"
-filter='^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$'
+filter="^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$"
 cat << DONE
-crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" '
+crontab -u '$user' -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" '
 {
    if (index(\$0,prefix)) {
       triggered=1
@@ -73,24 +73,30 @@ crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix"
       print
    }
 }
-' | crontab -u $user -
+' | crontab -u '$user' -
 DONE
 
 case "$state_should" in
     present)
         # if we insert new entry, filter also all entrys out with the same id 
-        echo "("
-        echo "crontab -u $user -l 2>/dev/null | grep -v -E \"$filter\" | grep -v \"# $name\\$\" 2>/dev/null || true"
-        echo "echo '$entry'"
-        echo ") | crontab -u $user -"
+        cat <<EOF
+(
+crontab -u '$user' -l 2>/dev/null | grep -v -E '$filter' | grep -v '# $name\\$' 2>/dev/null || true
+echo '$entry'
+) | crontab -u '$user' -
+EOF
     ;;
     absent)
         if [ -f "$__object/parameter/raw_command" ]; then
-            echo "( crontab -u $user -l 2>/dev/null | grep -v -E \"$filter\" 2>/dev/null || true ) | \\"
-            echo "grep -v \"^$entry\\$\" | crontab -u $user -"
+            cat <<EOF
+( crontab -u '$user' -l 2>/dev/null | grep -v -E '$filter' 2>/dev/null || true ) | \\
+grep -v '^$entry\\$' | crontab -u '$user' -
+EOF
         else
-            echo "( crontab -u $user -l 2>/dev/null | grep -v -E \"$filter\" 2>/dev/null || true ) | \\"
-            echo "grep -v \"# $name\\$\" | crontab -u $user -"
+            cat <<EOF
+( crontab -u '$user' -l 2>/dev/null | grep -v -E '$filter' 2>/dev/null || true ) | \\
+grep -v '# $name\\$' | crontab -u '$user' -
+EOF
         fi
     ;;
 esac
diff --git a/cdist/conf/type/__daemontools/files/init.d-svscan b/cdist/conf/type/__daemontools/files/init.d-svscan
index 996eb4e8..127dfdb3 100644
--- a/cdist/conf/type/__daemontools/files/init.d-svscan
+++ b/cdist/conf/type/__daemontools/files/init.d-svscan
@@ -23,9 +23,9 @@ fi
 
 case "$1" in
     start)
-        printf "Starting daemontools: "
-        if  ! pidof svscan > /dev/null 2>&1; then
-                printf "svscan "
+        echo -n "Starting daemontools: "
+        if [ ! `pidof svscan` ]; then
+                echo -n "svscan "
                 env - PATH="$PATH" svscan /service 2>&1 | setuidgid daemon multilog t /var/log/svscan &
                 echo "."
         else
@@ -33,28 +33,23 @@ case "$1" in
         fi
         ;;
     stop)
-        printf "Stopping daemontools: "
-        pids="$(pidof svscan)"
-        if [ -n "${pids}" ]
-        then
-                printf "svscan"
-                while [ -n "${pids}" ]
-                do
-                    # shellcheck disable=SC2086
-                    kill ${pids}
-                    printf "."
-                    pids="$(pidof svscan)"
+        echo -n "Stopping daemontools: "
+        if [ `pidof svscan` ]; then
+                echo -n "svscan"
+                while [ `pidof svscan` ]; do
+                     kill `pidof svscan`
+                     echo -n "."
                 done
         fi
-        printf " services"
-        for i in /service/*; do
-                svc -dx "$i"
-                printf "."
+        echo -n " services"
+        for i in `ls -d /service/*`; do
+                svc -dx $i
+                echo -n "."
         done
-        printf " logging "
-        for i in /service/*/log; do
-                svc -dx "$i"
-                printf "."
+        echo -n " logging "
+        for i in `ls -d /service/*/log`; do
+                svc -dx $i
+                echo -n "."
         done
         echo ""
         ;;
diff --git a/cdist/conf/type/__daemontools/manifest b/cdist/conf/type/__daemontools/manifest
index b04c7e07..656f4984 100755
--- a/cdist/conf/type/__daemontools/manifest
+++ b/cdist/conf/type/__daemontools/manifest
@@ -9,7 +9,6 @@ __directory "$servicedir" --mode 700
 os=$(cat "$__global/explorer/os")
 init=$(cat "$__global/explorer/init")
 
-require=""
 case $os in
 	freebsd)
 		# TODO change to __start_on_boot once it supports freebsd
diff --git a/cdist/conf/type/__daemontools_service/explorer/svc b/cdist/conf/type/__daemontools_service/explorer/svc
old mode 100755
new mode 100644
index 9ba462f2..d33fcea4
--- a/cdist/conf/type/__daemontools_service/explorer/svc
+++ b/cdist/conf/type/__daemontools_service/explorer/svc
@@ -1,2 +1 @@
-#!/bin/sh
 command -v svc || true
diff --git a/cdist/conf/type/__directory/explorer/stat b/cdist/conf/type/__directory/explorer/stat
index 03d466ba..41bc8b04 100755
--- a/cdist/conf/type/__directory/explorer/stat
+++ b/cdist/conf/type/__directory/explorer/stat
@@ -25,51 +25,23 @@ destination="/$__object_id"
 
 os=$("$__explorer/os")
 case "$os" in
-   "freebsd"|"netbsd"|"openbsd"|"macosx")
-      stat -f "type: %HT
+   "freebsd"|"netbsd"|"openbsd")
+      # FIXME: should be something like this based on man page, but can not test
+      stat -f "type: %ST
 owner: %Du %Su
 group: %Dg %Sg
-mode: %Lp %Sp
-" "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
-      ;;
-   alpine)
-      stat -c "type: %F
-owner: %u %U
-group: %g %G
-mode: %a %A
+mode: %Op %Sp
 " "$destination"
-      ;;
-    solaris)
-        ls1="$( ls -ld "$destination" )"
-        ls2="$( ls -ldn "$destination" )"
-
-        if [ -f "$__object/parameter/mode" ]
-        then mode_should="$( cat "$__object/parameter/mode" )"
-        fi
-
-        # yes, it is ugly hack, but if you know better way...
-        if [ -z "$( find "$destination" -perm "$mode_should" )" ]
-        then octets=888
-        else octets="$( echo "$mode_should" | sed 's/^0//' )"
-        fi
-
-        case "$( echo "$ls1" | cut -c1-1 )" in
-            -) echo 'type: regular file' ;;
-            d) echo 'type: directory' ;;
-        esac
-
-        echo "owner: $( echo "$ls2" \
-            | awk '{print $3}' ) $( echo "$ls1" \
-                | awk '{print $3}' )"
-
-        echo "group: $( echo "$ls2" \
-            | awk '{print $4}' ) $( echo "$ls1" \
-                | awk '{print $4}' )"
-
-        echo "mode: $octets $( echo "$ls1" | awk '{print $1}' )"
+   ;;
+    "macosx")
+       stat -f "type: %HT
+ owner: %Du %Su
+ group: %Dg %Sg
+ mode: %Lp %Sp
+ " "$destination"
     ;;
    *)
-       stat --printf="type: %F
+      stat --printf="type: %F
 owner: %u %U
 group: %g %G
 mode: %a %A
diff --git a/cdist/conf/type/__directory/gencode-remote b/cdist/conf/type/__directory/gencode-remote
index 374db47a..fd1ff9ff 100755
--- a/cdist/conf/type/__directory/gencode-remote
+++ b/cdist/conf/type/__directory/gencode-remote
@@ -57,18 +57,18 @@ get_current_value() {
 }
 
 set_group() {
-    echo "chgrp $recursive '$1' '$destination'"
-    echo "chgrp $recursive '$1'" >> "$__messages_out"
+    echo "chgrp '$recursive' '$1' '$destination'"
+    echo "chgrp $recursive $1" >> "$__messages_out"
 }
 
 set_owner() {
-    echo "chown $recursive '$1' '$destination'"
-    echo "chown $recursive '$1'" >> "$__messages_out"
+    echo "chown '$recursive' '$1' '$destination'"
+    echo "chown $recursive $1" >> "$__messages_out"
 }
 
 set_mode() {
-    echo "chmod $recursive '$1' '$destination'"
-    echo "chmod $recursive '$1'" >> "$__messages_out"
+    echo "chmod '$recursive' '$1' '$destination'"
+    echo "chmod $recursive $1" >> "$__messages_out"
 }
 
 case "$state_should" in
diff --git a/cdist/conf/type/__docker/man.rst b/cdist/conf/type/__docker/man.rst
index 718543a8..5cb28ee1 100644
--- a/cdist/conf/type/__docker/man.rst
+++ b/cdist/conf/type/__docker/man.rst
@@ -20,9 +20,6 @@ OPTIONAL PARAMETERS
 -------------------
 state
    'present' or 'absent', defaults to 'present'
-version
-   The specific version to install. Defaults to the special value 'latest',
-   meaning the version the package manager will install by default.
 
 
 BOOLEAN PARAMETERS
@@ -41,8 +38,6 @@ EXAMPLES
     # Remove docker
     __docker --state absent
 
-    # Install specific version
-    __docker --state present --version 18.03.0.ce
 
 AUTHORS
 -------
diff --git a/cdist/conf/type/__docker/manifest b/cdist/conf/type/__docker/manifest
index 6a57d85a..d501a9f1 100755
--- a/cdist/conf/type/__docker/manifest
+++ b/cdist/conf/type/__docker/manifest
@@ -21,24 +21,18 @@
 
 os=$(cat "$__global/explorer/os")
 state=$(cat "$__object/parameter/state")
-version=$(cat "$__object/parameter/version")
 
 case "$os" in
     centos)
-        # shellcheck source=/dev/null
-        if (. "$__global/explorer/os_release" && [ "${VERSION_ID}" = "7" ]); then
+        if (source "$__global/explorer/os_release" && [ "${VERSION_ID}" = "7" ]); then
           __yum_repo docker-ce-stable \
             --name 'Docker CE Stable' \
             --baseurl "https://download.docker.com/linux/centos/7/\$basearch/stable" \
             --enabled \
             --gpgcheck 1 \
             --gpgkey 'https://download.docker.com/linux/centos/gpg' \
-            --state "${state}"
-          if [ "$version" != "latest" ]; then
-            require="__yum_repo/docker-ce-stable" __package docker-ce --version "${version}" --state "${state}"
-          else
-            require="__yum_repo/docker-ce-stable" __package docker-ce --state "${state}"
-          fi
+            --state ${state}
+          require="__yum_repo/docker-ce-stable" __package docker-ce --state ${state}
         else
           echo "CentOS version 7 is required!" >&2
           exit 1
@@ -51,55 +45,15 @@ case "$os" in
         __package gnupg2
       fi
       __apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
-        --uri "https://download.docker.com/linux/${os}/gpg" --state "${state}"
-
-      require="__apt_key_uri/docker" __apt_source docker \
+        --uri "https://download.docker.com/linux/${os}/gpg" --state ${state}
+      export CDIST_ORDER_DEPENDENCY=on
+      __apt_source docker \
          --uri "https://download.docker.com/linux/${os}" \
          --distribution "$(cat "$__global/explorer/lsb_codename")" \
-         --state "${state}" \
+         --state ${state} \
          --component "stable"
-      if [ "$version" != "latest" ]; then
-        require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
-      else
-        require="__apt_source/docker" __package docker-ce --state "${state}"
-      fi
-   ;;
-   devuan)
-      os_version="$(cat "$__global/explorer/os_version")"
-
-      case "$os_version" in
-        ascii)
-          distribution="stretch"
-        ;;
-        jessie)
-          distribution="jessie"
-        ;;
-        *)
-          echo "Your devuan release ($os_version) is currently not supported by this type (${__type##*/}).">&2
-          echo "Please contribute an implementation for it if you can." >&2
-          exit 1
-        ;;
-      esac
-
-      if [ "${state}" = "present" ]; then
-        __package apt-transport-https
-        __package ca-certificates
-        __package gnupg2
-      fi
-      __apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
-        --uri "https://download.docker.com/linux/${os}/gpg" --state "${state}"
-
-      require="__apt_key_uri/docker" __apt_source docker \
-         --uri "https://download.docker.com/linux/${os}" \
-         --distribution "${distribution}" \
-         --state "${state}" \
-         --component "stable"
-      if [ "$version" != "latest" ]; then
-        require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
-      else
-        require="__apt_source/docker" __package docker-ce --state "${state}"
-      fi
-
+      __package docker-ce --state ${state}
+      unset CDIST_ORDER_DEPENDENCY
    ;;
    *)
       echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
diff --git a/cdist/conf/type/__docker/parameter/default/version b/cdist/conf/type/__docker/parameter/default/version
deleted file mode 100644
index a0f9a4b4..00000000
--- a/cdist/conf/type/__docker/parameter/default/version
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/cdist/conf/type/__docker/parameter/optional b/cdist/conf/type/__docker/parameter/optional
index 4d595ed7..ff72b5c7 100644
--- a/cdist/conf/type/__docker/parameter/optional
+++ b/cdist/conf/type/__docker/parameter/optional
@@ -1,2 +1 @@
 state
-version
diff --git a/cdist/conf/type/__docker_compose/gencode-remote b/cdist/conf/type/__docker_compose/gencode-remote
index 77fc2fdf..4872d83d 100755
--- a/cdist/conf/type/__docker_compose/gencode-remote
+++ b/cdist/conf/type/__docker_compose/gencode-remote
@@ -24,8 +24,7 @@ state="$(cat "$__object/parameter/state")"
 
 if [ "${state}" = "present" ]; then
     # Download docker-compose file
-    #shellcheck disable=SC2016
-    echo 'curl -L "https://github.com/docker/compose/releases/download/'"${version}"'/docker-compose-$(uname -s)-$(uname -m)" -o /tmp/docker-compose'
+    echo "curl -L 'https://github.com/docker/compose/releases/download/${version}/docker-compose-$(uname -s)-$(uname -m)' -o /tmp/docker-compose"
     echo 'mv /tmp/docker-compose /usr/local/bin/docker-compose'
     # Change permissions
     echo 'chmod +x /usr/local/bin/docker-compose'
diff --git a/cdist/conf/type/__docker_swarm/explorer/swarm-state b/cdist/conf/type/__docker_swarm/explorer/swarm-state
index 2c9fd598..9c1bc32d 100755
--- a/cdist/conf/type/__docker_swarm/explorer/swarm-state
+++ b/cdist/conf/type/__docker_swarm/explorer/swarm-state
@@ -18,4 +18,4 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-docker info 2>/dev/null | grep '^ *Swarm: ' | awk '{print $2}'
+docker info 2>/dev/null | grep "^Swarm: " | cut -d " " -f 2-
diff --git a/cdist/conf/type/__dot_file/explorer/home b/cdist/conf/type/__dot_file/explorer/home
index 08d941bf..132cfc71 100755
--- a/cdist/conf/type/__dot_file/explorer/home
+++ b/cdist/conf/type/__dot_file/explorer/home
@@ -19,7 +19,7 @@ set -eu
 
 user="$(cat "${__object}/parameter/user")"
 
-if command -v getent >/dev/null 2>&1; then
+if which getent >/dev/null 2>&1; then
 	line=$(getent passwd "${user}")
 else
 	line=$(grep "^${user}:" /etc/passwd)
diff --git a/cdist/conf/type/__file/explorer/stat b/cdist/conf/type/__file/explorer/stat
index 13c1c208..8a917556 100755
--- a/cdist/conf/type/__file/explorer/stat
+++ b/cdist/conf/type/__file/explorer/stat
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # 2013 Steven Armstrong (steven-cdist armstrong.cc)
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -26,56 +25,25 @@ destination="/$__object_id"
 
 os=$("$__explorer/os")
 case "$os" in
-   "freebsd"|"netbsd"|"openbsd"|"macosx")
-      stat -f "type: %HT
+   "freebsd"|"netbsd"|"openbsd")
+      # FIXME: should be something like this based on man page, but can not test
+      stat -f "type: %ST
+owner: %Du %Su
+group: %Dg %Sg
+mode: %Op %Sp
+size: %Dz
+links: %Dl
+" "$destination"
+   ;;
+   "macosx")
+     stat -f "type: %HT
 owner: %Du %Su
 group: %Dg %Sg
 mode: %Lp %Sp
 size: %Dz
 links: %Dl
-" "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
-      ;;
-   alpine)
-       # busybox stat
-      stat -c "type: %F
-owner: %u %U
-group: %g %G
-mode: %a %A
-size: %s
-links: %h
 " "$destination"
-      ;;
-    solaris)
-        ls1="$( ls -ld "$destination" )"
-        ls2="$( ls -ldn "$destination" )"
-
-        if [ -f "$__object/parameter/mode" ]
-        then mode_should="$( cat "$__object/parameter/mode" )"
-        fi
-
-        # yes, it is ugly hack, but if you know better way...
-        if [ -z "$( find "$destination" -perm "$mode_should" )" ]
-        then octets=888
-        else octets="$( echo "$mode_should" | sed 's/^0//' )"
-        fi
-
-        case "$( echo "$ls1" | cut -c1-1 )" in
-            -) echo 'type: regular file' ;;
-            d) echo 'type: directory' ;;
-        esac
-
-        echo "owner: $( echo "$ls2" \
-            | awk '{print $3}' ) $( echo "$ls1" \
-                | awk '{print $3}' )"
-
-        echo "group: $( echo "$ls2" \
-            | awk '{print $4}' ) $( echo "$ls1" \
-                | awk '{print $4}' )"
-
-        echo "mode: $octets $( echo "$ls1" | awk '{print $1}' )"
-        echo "size: $( echo "$ls1" | awk '{print $5}' )"
-        echo "links: $( echo "$ls1" | awk '{print $2}' )"
-    ;;
+   ;;
    *)
       stat --printf="type: %F
 owner: %u %U
@@ -84,5 +52,5 @@ mode: %a %A
 size: %s
 links: %h
 " "$destination"
-      ;;
+   ;;
 esac
diff --git a/cdist/conf/type/__file/gencode-local b/cdist/conf/type/__file/gencode-local
index fb9f9a92..7ca5941f 100755
--- a/cdist/conf/type/__file/gencode-local
+++ b/cdist/conf/type/__file/gencode-local
@@ -54,7 +54,7 @@ if [ "$state_should" = "present" ] || [ "$state_should" = "exists" ]; then
          source="$__object/stdin"
       fi
       if [ ! -f "$source" ]; then
-         echo "Source \"$source\" does not exist." >&2
+         echo "Source '$source' does not exist." >&2
          exit 1
       else
          if [ "$type" != "file" ]; then
@@ -96,7 +96,7 @@ DONE
       fi
 # move uploaded file into place
 cat << DONE
-$__remote_exec $__target_host "rm -rf \"$destination\"; mv \"\$destination_upload\" \"$destination\""
+$__remote_exec $__target_host "rm -rf '$destination'; mv \"\$destination_upload\" '$destination'"
 DONE
    fi
 fi
diff --git a/cdist/conf/type/__file/gencode-remote b/cdist/conf/type/__file/gencode-remote
index b04c471e..8c8b426d 100755
--- a/cdist/conf/type/__file/gencode-remote
+++ b/cdist/conf/type/__file/gencode-remote
@@ -23,7 +23,7 @@ destination="/$__object_id"
 state_should="$(cat "$__object/parameter/state")"
 type="$(cat "$__object/explorer/type")"
 stat_file="$__object/explorer/stat"
-fire_onchange=''
+
 
 get_current_value() {
     if [ -s "$stat_file" ]; then
@@ -44,20 +44,17 @@ get_current_value() {
 
 set_group() {
     echo "chgrp '$1' '$destination'"
-    echo "chgrp '$1'" >> "$__messages_out"
-    fire_onchange=1
+    echo "chgrp $1" >> "$__messages_out"
 }
 
 set_owner() {
     echo "chown '$1' '$destination'"
-    echo "chown '$1'" >> "$__messages_out"
-    fire_onchange=1
+    echo "chown $1" >> "$__messages_out"
 }
 
 set_mode() {
    echo "chmod '$1' '$destination'"
-   echo "chmod '$1'" >> "$__messages_out"
-   fire_onchange=1
+   echo "chmod $1" >> "$__messages_out"
 }
 
 case "$state_should" in
@@ -79,10 +76,6 @@ case "$state_should" in
             fi
         fi
     done
-    if [ -f "$__object/files/set-attributes" ]; then
-        # set-attributes is created if file is created or uploaded in gencode-local
-        fire_onchange=1
-    fi
 
     ;;
 
@@ -90,7 +83,6 @@ case "$state_should" in
         if [ "$type" = "file" ]; then
             echo "rm -f '$destination'"
             echo remove >> "$__messages_out"
-            fire_onchange=1
         fi
     ;;
 
@@ -99,9 +91,3 @@ case "$state_should" in
         exit 1
     ;;
 esac
-
-if [ -f "$__object/parameter/onchange" ]; then
-   if [ -n "$fire_onchange" ]; then
-      cat "$__object/parameter/onchange"
-   fi
-fi
diff --git a/cdist/conf/type/__file/man.rst b/cdist/conf/type/__file/man.rst
index 7a0603bb..a141d70b 100644
--- a/cdist/conf/type/__file/man.rst
+++ b/cdist/conf/type/__file/man.rst
@@ -63,9 +63,6 @@ source
    If not supplied, an empty file or directory will be created.
    If source is '-' (dash), take what was written to stdin as the file content.
 
-onchange
-   The code to run if file is modified.
-
 MESSAGES
 --------
 chgrp <group>
diff --git a/cdist/conf/type/__file/parameter/optional b/cdist/conf/type/__file/parameter/optional
index 9b98352c..c696d592 100644
--- a/cdist/conf/type/__file/parameter/optional
+++ b/cdist/conf/type/__file/parameter/optional
@@ -3,4 +3,3 @@ group
 mode
 owner
 source
-onchange
diff --git a/cdist/conf/type/__firewalld_rule/gencode-remote b/cdist/conf/type/__firewalld_rule/gencode-remote
index bd6d13e5..35835635 100755
--- a/cdist/conf/type/__firewalld_rule/gencode-remote
+++ b/cdist/conf/type/__firewalld_rule/gencode-remote
@@ -19,6 +19,7 @@
 #
 #
 
+# name="$__object_id"
 state_should="$(cat "$__object/parameter/state")"
 state_is="$(cat "$__object/explorer/rule")"
 
diff --git a/cdist/conf/type/__firewalld_start/gencode-remote b/cdist/conf/type/__firewalld_start/gencode-remote
index 3e767f68..dd675749 100755
--- a/cdist/conf/type/__firewalld_start/gencode-remote
+++ b/cdist/conf/type/__firewalld_start/gencode-remote
@@ -42,16 +42,16 @@ esac
 if [ "$init" = 'systemd' ]; then
     # this handles ALL linux distros with systemd
     # e.g. archlinux, gentoo in some cases, new RHEL and SLES versions
-    echo "systemctl \"$cmd\" \"$name\""
+    echo "systemctl '$cmd' '$name'"
 else
     case "$os" in
         debian)
             case "$os_version" in
                 [1-7]*)
-                    echo "service \"$name\" \"$cmd\""
+                    echo "service '$name' '$cmd'"
                 ;;
                 8*)
-                    echo "systemctl \"$cmd\" \"$name\""
+                    echo "systemctl '$cmd' '$name'"
                 ;;
                 *)
                     echo "Unsupported version $os_version of $os" >&2
@@ -61,19 +61,19 @@ else
         ;;
 
         gentoo)
-            echo service \"$name\" \"$cmd\"
+            echo "service '$name' '$cmd'"
         ;;
 
         amazon|scientific|centos|fedora|owl|redhat|suse)
-            echo service \"$name\" \"$cmd\"
+            echo "service '$name' '$cmd'"
         ;;
 
         openwrt)
-            echo "/etc/init.d/\"$name\" \"$cmd\""
+            echo "'/etc/init.d/$name' '$cmd'"
         ;;
 
         ubuntu)
-            echo "service \"$name\" \"$cmd\""
+            echo "service '$name' '$cmd'"
         ;;
 
         *)
diff --git a/cdist/conf/type/__git/gencode-remote b/cdist/conf/type/__git/gencode-remote
index 5a9e23fc..d6644e5b 100755
--- a/cdist/conf/type/__git/gencode-remote
+++ b/cdist/conf/type/__git/gencode-remote
@@ -36,9 +36,9 @@ group="$(cat "$__object/parameter/group")"
 mode="$(cat "$__object/parameter/mode")"
 
 [  "$state_should" = "$state_is" ] && \
-[  "$owner" = "$owner_is" ] && \
-[  "$group" = "$group_is" ] && \
-[  -n "$mode" ] && exit 0
+   [ "$owner" = "$owner_is" ] && \
+   [ "$group" = "$group_is" ] && \
+   [ -n "$mode" ] && exit 0
 
 case $state_should in
     present)
@@ -46,8 +46,8 @@ case $state_should in
         if [ "$state_should" != "$state_is" ]; then
             echo git clone --quiet --branch "$branch" "$source" "$destination"
         fi
-        if { [ -n "$owner" ] && [ "$owner_is" != "$owner" ]; } || \
-           { [ -n "$group" ] && [ "$group_is" != "$group" ]; }; then
+        if ([ -n "$owner" ] && [ "$owner_is" != "$owner" ]) || \
+            ([ -n "$group" ] && [ "$group_is" != "$group" ]); then
             echo chown -R "${owner}:${group}" "$destination"
         fi
         if [ -n "$mode" ]; then
diff --git a/cdist/conf/type/__git/man.rst b/cdist/conf/type/__git/man.rst
index 130925c8..17e9c623 100644
--- a/cdist/conf/type/__git/man.rst
+++ b/cdist/conf/type/__git/man.rst
@@ -44,7 +44,7 @@ EXAMPLES
     __git /home/services/dokuwiki --source git://github.com/splitbrain/dokuwiki.git
 
     # Checkout cdist, stay on branch 2.1
-    __git /home/nico/cdist --source git@code.ungleich.ch:ungleich-public/cdist.git --branch 2.1
+    __git /home/nico/cdist --source git://github.com/ungleich/cdist.git --branch 2.1
 
 
 AUTHORS
diff --git a/cdist/conf/type/__go_get/explorer/go-executable b/cdist/conf/type/__go_get/explorer/go-executable
old mode 100755
new mode 100644
index 87182282..4c84ce07
--- a/cdist/conf/type/__go_get/explorer/go-executable
+++ b/cdist/conf/type/__go_get/explorer/go-executable
@@ -1,6 +1,3 @@
-#!/bin/sh
-# shellcheck disable=SC1091
 [ -f /etc/environment ] && . /etc/environment
-# shellcheck disable=SC1091
 [ -f /etc/profile     ] && . /etc/profile
 go version 2>/dev/null || true
diff --git a/cdist/conf/type/__golang_from_vendor/manifest b/cdist/conf/type/__golang_from_vendor/manifest
index ad39ddfb..cf164524 100755
--- a/cdist/conf/type/__golang_from_vendor/manifest
+++ b/cdist/conf/type/__golang_from_vendor/manifest
@@ -1,4 +1,3 @@
 #!/bin/sh -e
 
-# shellcheck disable=SC2016
 __line go_in_path --line 'export PATH=/usr/local/go/bin:$PATH' --file /etc/profile
diff --git a/cdist/conf/type/__grafana_dashboard/manifest b/cdist/conf/type/__grafana_dashboard/manifest
index e652202b..727356e5 100755
--- a/cdist/conf/type/__grafana_dashboard/manifest
+++ b/cdist/conf/type/__grafana_dashboard/manifest
@@ -1,19 +1,16 @@
 #!/bin/sh -e
 
-os=$(cat "$__global/explorer/os")
-os_version=$(cat "$__global/explorer/os_version")
+os="$(cat "$__global/explorer/os")"
+os_version="$(cat "$__global/explorer/os_version")"
 
-require=""
 case $os in
     debian|devuan)
         case $os_version in
             8*|jessie)
-                # Differntation not needed anymore
-                apt_source_distribution=stable
+                apt_source_distribution=jessie
                 ;;
             9*|ascii/ceres|ascii)
-                # Differntation not needed anymore
-                apt_source_distribution=stable
+                apt_source_distribution=stretch
                 ;;
             *)
                 echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!" >&2
@@ -23,10 +20,10 @@ case $os in
 
         __apt_key_uri grafana \
             --name 'Grafana Release Signing Key' \
-            --uri https://packages.grafana.com/gpg.key
+            --uri https://packagecloud.io/gpg.key
 
         require="$require __apt_key_uri/grafana" __apt_source grafana \
-                    --uri https://packages.grafana.com/oss/deb \
+                    --uri https://packagecloud.io/grafana/stable/debian/ \
                     --distribution $apt_source_distribution \
                     --component main
 
diff --git a/cdist/conf/type/__group/explorer/gshadow b/cdist/conf/type/__group/explorer/gshadow
index ef40b7bc..2f63b31b 100755
--- a/cdist/conf/type/__group/explorer/gshadow
+++ b/cdist/conf/type/__group/explorer/gshadow
@@ -22,7 +22,7 @@
 #
 
 name=$__object_id
-os="$("$__explorer/os")"
+os="$("${__explorer}"/os)"
 
 case "$os" in
     "freebsd"|"netbsd")
diff --git a/cdist/conf/type/__group/gencode-remote b/cdist/conf/type/__group/gencode-remote
index 6091c548..5b053f48 100755
--- a/cdist/conf/type/__group/gencode-remote
+++ b/cdist/conf/type/__group/gencode-remote
@@ -30,9 +30,9 @@ state="$(cat "$__object/parameter/state")"
 # Use short option names for portability
 shorten_property() {
    case "$1" in
-      gid) echo " -g";;
-      password) echo " -p";;
-      system) echo " -r";;
+      gid) printf -- "-g\n";;
+      password) printf -- "-p\n";;
+      system) printf -- "-r\n";;
    esac
 }
 
@@ -62,7 +62,7 @@ if [ "$state" = "present" ]; then
             esac
             if [ "$new_value" != "$current_value" ]; then
                set -- "$@" "$(shorten_property "$property")" \'"$new_value"\'
-               echo "change $property $new_value $current_value" >> "$__messages_out"
+               echo change "$property" "$new_value" "$current_value" >> "$__messages_out"
             fi
          fi
       done
diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote
index 8b5797dd..b729b667 100755
--- a/cdist/conf/type/__hostname/gencode-remote
+++ b/cdist/conf/type/__hostname/gencode-remote
@@ -35,7 +35,7 @@ has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
 # If everything is ok -> exit
 #
 case "$os" in
-    archlinux|debian|suse|ubuntu|devuan|coreos|alpine)
+    archlinux|debian|suse|ubuntu|devuan|coreos)
         if [ "$name_config" = "$name_should" ] && [ "$name_running" = "$name_should" ]; then
             exit 0
         fi
@@ -58,8 +58,8 @@ echo changed >> "$__messages_out"
 
 # Use the good old way to set the hostname even on machines running systemd.
 case "$os" in
-    archlinux|debian|ubuntu|devuan|centos|coreos|alpine)
-        printf "printf '%%s\\\\n' '$name_should' > /etc/hostname\\n"
+    archlinux|debian|ubuntu|devuan|centos|coreos)
+        echo "printf '%s\n' '$name_should' > /etc/hostname"
         echo "hostname -F /etc/hostname"
     ;;
     freebsd|openbsd)
@@ -67,7 +67,7 @@ case "$os" in
     ;;
     suse)
         echo "hostname '$name_should'"
-        printf "printf '%%s\\\\n' '$name_should' > /etc/HOSTNAME\\n"
+        echo "printf '%s\n' '$name_should' > /etc/HOSTNAME"
     ;;
 esac
 
diff --git a/cdist/conf/type/__hostname/manifest b/cdist/conf/type/__hostname/manifest
index 8f1adf12..c03b2eac 100755
--- a/cdist/conf/type/__hostname/manifest
+++ b/cdist/conf/type/__hostname/manifest
@@ -41,7 +41,7 @@ not_supported() {
 }
 
 case "$os" in
-    archlinux|debian|suse|ubuntu|devuan|coreos|alpine)
+    archlinux|debian|suse|ubuntu|devuan|coreos)
         # handled in gencode-remote
         :
     ;;
diff --git a/cdist/conf/type/__install_config/files/remote/copy b/cdist/conf/type/__install_config/files/remote/copy
index fa7fa9b7..15c901f9 100755
--- a/cdist/conf/type/__install_config/files/remote/copy
+++ b/cdist/conf/type/__install_config/files/remote/copy
@@ -37,12 +37,10 @@ code="$(echo "$@" | sed "s|$target_host:|$target_host:$chroot|g")"
 
 log "target_host: $target_host"
 log "chroot: $chroot"
-log "@: $*"
+log "@: $@"
 log "code: $code"
 
 # copy files into chroot
-# __default_remote_copy and code should be split
-# shellcheck disable=SC2086
 $__default_remote_copy $code
 
 log "-----"
diff --git a/cdist/conf/type/__install_config/files/remote/exec b/cdist/conf/type/__install_config/files/remote/exec
index c2057ebf..5b25e41e 100755
--- a/cdist/conf/type/__install_config/files/remote/exec
+++ b/cdist/conf/type/__install_config/files/remote/exec
@@ -36,17 +36,14 @@ shift
 
 # escape ' with '"'"'
 code="$(echo "$@" | sed -e "s/'/'\"'\"'/g")"
-# shellcheck disable=SC2089
 code="chroot $chroot sh -e -c '$code'"
 
 log "target_host: $target_host"
 log "chroot: $chroot"
-log "@: $*"
+log "@: $@"
 log "code: $code"
 
 # Run the code
-# __default_remote_exec and code should be split
-# shellcheck disable=SC2086,SC2090
-$__default_remote_exec "$target_host" $code
+$__default_remote_exec $target_host $code
 
 log "-----"
diff --git a/cdist/conf/type/__install_coreos/gencode-remote b/cdist/conf/type/__install_coreos/gencode-remote
index f550b5a5..fbe86479 100755
--- a/cdist/conf/type/__install_coreos/gencode-remote
+++ b/cdist/conf/type/__install_coreos/gencode-remote
@@ -12,7 +12,7 @@ eof
 
 coreos-install -d "${device}" \
 	\$(if [ -s "\${ignition_file}" ]; then
-		printf -- "-i \${ignition_file}\\n"
+		printf -- "-i \${ignition_file}\n"
 	fi)
 
 rm "\${ignition_file}"
diff --git a/cdist/conf/type/__install_mkfs/manifest b/cdist/conf/type/__install_mkfs/manifest
index b0a21dae..9d0e05f6 100755
--- a/cdist/conf/type/__install_mkfs/manifest
+++ b/cdist/conf/type/__install_mkfs/manifest
@@ -19,6 +19,17 @@
 #
 
 # set defaults
+# if [ -f "$__object/parameter/device" ]; then
+#    device="(cat "$__object/parameter/device")"
+# else
+#    device="/$__object_id"
+#    echo "$device" > "$__object/parameter/device"
+# fi
+
+# type="(cat "$__object/parameter/type")"
+
+# options="(cat "$__object/parameter/options")"
+
 if [ ! -f "$__object/parameter/device" ]; then
    device="/$__object_id"
    echo "$device" > "$__object/parameter/device"
diff --git a/cdist/conf/type/__install_partition_msdos_apply/files/lib.sh b/cdist/conf/type/__install_partition_msdos_apply/files/lib.sh
index 2db9a441..cddc575d 100644
--- a/cdist/conf/type/__install_partition_msdos_apply/files/lib.sh
+++ b/cdist/conf/type/__install_partition_msdos_apply/files/lib.sh
@@ -1,20 +1,18 @@
-#!/bin/sh
-
 die() {
-   echo "[__install_partition_msdos_apply] $*" >&2
+   echo "[__install_partition_msdos_apply] $@" >&2
    exit 1
 }
 debug() {
-   #echo "[__install_partition_msdos_apply] $*" >&2
+   #echo "[__install_partition_msdos_apply] $@" >&2
    :
 }
 
 fdisk_command() {
-   device="$1"
-   cmd="$2"
+   local device="$1"
+   local cmd="$2"
 
    debug fdisk_command "running fdisk command '${cmd}' on device ${device}"
-   printf '%s\nw\n' "${cmd}" | fdisk -c -u "$device"
+   printf "${cmd}\nw\n" | fdisk -c -u "$device"
    ret=$?
    # give disk some time
    sleep 1
@@ -22,49 +20,49 @@ fdisk_command() {
 }
 
 create_disklabel() {
-   device=$1
+   local device=$1
 
    debug create_disklabel "creating new msdos disklabel"
-   fdisk_command "${device}" "o"
+   fdisk_command ${device} "o"
    return $?
 }
 
 toggle_bootable() {
-   device="$1"
-   minor="$2"
-   fdisk_command "${device}" "a\\n${minor}\\n"
+   local device="$1"
+   local minor="$2"
+   fdisk_command ${device} "a\n${minor}\n"
    return $?
 }
 
 create_partition() {
-  device="$1"
-  minor="$2"
-  size="$3"
-  type="$4"
-  primary_count="$5"
+  local device="$1"
+  local minor="$2"
+  local size="$3"
+  local type="$4"
+  local primary_count="$5"
 
-  if [ "$type" = "extended" ] || [ "$type" = "5" ]; then
+  if [ "$type" = "extended" -o "$type" = "5" ]; then
     # Extended partition
-    primary_extended='e\n'
-    first_minor="${minor}\\n"
+    primary_extended="e\n"
+    first_minor="${minor}\n"
     [ "${minor}" = "4" ] && first_minor=""
-    type_minor="${minor}\\n"
+    type_minor="${minor}\n"
     [ "${minor}" = "1" ] && type_minor=""
     type="5"
   elif [ "${minor}" -lt "5" ]; then
-    primary_extended='p\n'
-    first_minor="${minor}\\n"
+    primary_extended="p\n"
+    first_minor="${minor}\n"
     [ "${minor}" = "4" ] && first_minor=""
-    type_minor="${minor}\\n"
+    type_minor="${minor}\n"
     [ "${minor}" = "1" ] && type_minor=""
   else
     # Logical partitions
-    first_minor="${minor}\\n"
-    type_minor="${minor}\\n"
-    primary_extended='l\n'
+    first_minor="${minor}\n"
+    type_minor="${minor}\n"
+    primary_extended="l\n"
     [ "$primary_count" -gt "3" ] && primary_extended=""
   fi
   [ -n "${size}" ] && size="+${size}M"
-  fdisk_command "${device}" "n\\n${primary_extended}${first_minor}\\n${size}\\nt\\n${type_minor}${type}\\n"
+  fdisk_command ${device} "n\n${primary_extended}${first_minor}\n${size}\nt\n${type_minor}${type}\n"
   return $?
 }
diff --git a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
index a0b46b2d..240ae00b 100755
--- a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
+++ b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
@@ -21,11 +21,11 @@
 #set -x
 
 die() {
-   echo "[__install_partition_msdos_apply] $*" >&2
+   echo "[__install_partition_msdos_apply]" "$@" >&2
    exit 1
 }
 debug() {
-   #echo "[__install_partition_msdos_apply] $*" >&2
+   #echo "[__install_partition_msdos_apply] $@" >&2
    :
 }
 
diff --git a/cdist/conf/type/__install_reboot/gencode-remote b/cdist/conf/type/__install_reboot/gencode-remote
index 9a6322c1..2f67d4d4 100755
--- a/cdist/conf/type/__install_reboot/gencode-remote
+++ b/cdist/conf/type/__install_reboot/gencode-remote
@@ -18,6 +18,8 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
+# options="$(cat "$__object/parameter/options")"
+
 #echo "reboot $options"
 cat << DONE
 echo 1 > /proc/sys/kernel/sysrq
diff --git a/cdist/conf/type/__install_reboot/man.rst b/cdist/conf/type/__install_reboot/man.rst
index 9a53b37a..ecf78ca7 100644
--- a/cdist/conf/type/__install_reboot/man.rst
+++ b/cdist/conf/type/__install_reboot/man.rst
@@ -18,7 +18,8 @@ None
 
 OPTIONAL PARAMETERS
 -------------------
-None
+options
+   options to pass to the reboot command. e.g. -f
 
 
 EXAMPLES
diff --git a/cdist/conf/type/__user/manifest b/cdist/conf/type/__install_reboot/manifest
old mode 100644
new mode 100755
similarity index 71%
rename from cdist/conf/type/__user/manifest
rename to cdist/conf/type/__install_reboot/manifest
index 8f10b38c..6255d525
--- a/cdist/conf/type/__user/manifest
+++ b/cdist/conf/type/__install_reboot/manifest
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -17,16 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
-#
-# Manage users.
 
-os=$(cat "$__global/explorer/os")
-
-case "$os" in
-    alpine)
-        __package shadow
-        ;;
-    *)
-        :
-        ;;
-esac
+# set defaults
+# options="$(cat "$__object/parameter/options" 2>/dev/null \
+#   || echo "" | tee "$__object/parameter/options")"
+[ -f "$__object/parameter/options" ] || touch "$__object/parameter/options"
diff --git a/cdist/conf/type/__install_reset_disk/gencode-remote b/cdist/conf/type/__install_reset_disk/gencode-remote
index ac9ae6cf..947dd472 100755
--- a/cdist/conf/type/__install_reset_disk/gencode-remote
+++ b/cdist/conf/type/__install_reset_disk/gencode-remote
@@ -67,5 +67,5 @@ fi
 
 # erase partition table
 dd if=/dev/zero of=$disk bs=512 count=1
-printf 'w\\n' | fdisk -u -c $disk || true
+printf 'w\n' | fdisk -u -c $disk || true
 DONE
diff --git a/cdist/conf/type/__acl/explorer/file_is b/cdist/conf/type/__install_umount/manifest
similarity index 69%
rename from cdist/conf/type/__acl/explorer/file_is
rename to cdist/conf/type/__install_umount/manifest
index 096cffd1..07753ac9 100755
--- a/cdist/conf/type/__acl/explorer/file_is
+++ b/cdist/conf/type/__install_umount/manifest
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# 2018 Ander Punnar (ander-at-kvlt-dot-ee)
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -18,14 +18,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-if [ -e "/$__object_id" ]
-then
-    if [ -d "/$__object_id" ]
-    then echo directory
-    elif [ -f "/$__object_id" ]
-    then echo regular
-    else echo other
-    fi
-else
-    echo missing
-fi
+# set defaults
+# target="$(cat "$__object/parameter/target" 2>/dev/null \
+#    || echo "/target" | tee "$__object/parameter/target")"
+cat "$__object/parameter/target" 2>/dev/null 1>/dev/null || echo "/target" > "$__object/parameter/target"
diff --git a/cdist/conf/type/__install_umount/parameter/default/target b/cdist/conf/type/__install_umount/parameter/default/target
deleted file mode 100644
index ea8c4bf7..00000000
--- a/cdist/conf/type/__install_umount/parameter/default/target
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/cdist/conf/type/__install_umount/parameter/optional b/cdist/conf/type/__install_umount/parameter/optional
deleted file mode 100644
index eb5a316c..00000000
--- a/cdist/conf/type/__install_umount/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/cdist/conf/type/__iptables_apply/files/init-script b/cdist/conf/type/__iptables_apply/files/init-script
index d9c79ef7..2247dcf5 100644
--- a/cdist/conf/type/__iptables_apply/files/init-script
+++ b/cdist/conf/type/__iptables_apply/files/init-script
@@ -24,15 +24,13 @@ case $1 in
         iptables-save > "$status"
 
         # Apply our ruleset
-        cd "$basedir" || exit
-        count="$(find . ! -name . -prune | wc -l)"
+        cd "$basedir"
+        count="$(ls -1 | wc -l)"
 
         # Only do something if there are rules
         if [ "$count" -ge 1 ]; then
             for rule in *; do
                 echo "Applying iptables rule $rule ..."
-                # Rule should be split.
-                # shellcheck disable=SC2046
                 iptables $(cat "$rule")
             done
         fi
diff --git a/cdist/conf/type/__jail/manifest b/cdist/conf/type/__jail/manifest
index fad6a3a1..6fb4a306 100755
--- a/cdist/conf/type/__jail/manifest
+++ b/cdist/conf/type/__jail/manifest
@@ -37,13 +37,14 @@ jaildir="$(cat "$__object/parameter/jaildir")"
 
 __directory "${jaildir}" --parents
 
-set -- "$@" "$__object_id"
+set -- "$@" "$__object_id" "--state" "$state"
 cd "$__object/parameter"
 for property in *; do
 	set -- "$@" "--$property" "$(cat "$property")"
 done
 
-if grep -q '^10\.' "$(cat "$__global/explorer/os_version")" ; then   # Version is 10.x
+ver="$(cat "$__global/explorer/os_version")"
+if echo "$ver" | grep -q '^10\.'; then   # Version is 10.x
    __jail_freebsd10 "$@"
 else
    __jail_freebsd9 "$@"
diff --git a/cdist/conf/type/__jail_freebsd10/explorer/status b/cdist/conf/type/__jail_freebsd10/explorer/status
index c8039f21..1ceba212 100755
--- a/cdist/conf/type/__jail_freebsd10/explorer/status
+++ b/cdist/conf/type/__jail_freebsd10/explorer/status
@@ -39,7 +39,7 @@ fi
 # backslash-escaped $jaildir
 sjaildir="$(echo ${jaildir} | sed 's#/#\\/#g')"
 
-jls_output="$(jls | grep "[ 	]${sjaildir}\\/${name}\$")" || true
+jls_output="$(jls | grep "[ 	]${sjaildir}\/${name}\$")" || true
 
 if [ -n "${jls_output}" ]; then
    echo "STARTED"
diff --git a/cdist/conf/type/__jail_freebsd10/gencode-remote b/cdist/conf/type/__jail_freebsd10/gencode-remote
index 4f376c25..9be33b6d 100755
--- a/cdist/conf/type/__jail_freebsd10/gencode-remote
+++ b/cdist/conf/type/__jail_freebsd10/gencode-remote
@@ -36,7 +36,7 @@ state="$(cat "$__object/parameter/state")"
 
 started="true"
 # If the user wants the jail gone, it implies it shouldn't be started.
-{ [ -f "$__object/parameter/stopped" ] || [ "$state" = "absent" ]; } && started="false"
+([ -f "$__object/parameter/stopped" ] || [ "$state" = "absent" ]) && started="false"
 
 if [ -f "$__object/parameter/ip" ]; then
    ip="$(cat "$__object/parameter/ip")"
@@ -45,7 +45,7 @@ else
 #    when $state=present, it's required. Enforce this.
    if [ "$state" = "present" ]; then
       exec >&2
-      printf 'If --state is "present", --ip must be given\!\n'
+      echo "If --state is 'present,' --ip must be given\!"
       exit 1
    fi
 fi
@@ -86,10 +86,10 @@ status="$(cat "$__object/explorer/status")"
 if [ "$(expr "${ip}" : ".*, .*")" -gt "0" ]; then
    SAVE_IFS="$IFS"
    IFS=", "
-   for cur_ip in ${ip}; do
+   # for cur_ip in ${ip}; do
       # Just get the last IP address for SSH to listen on
-      mgmt_ip=$(echo "${cur_ip}" | cut '-d ' -f1)   # In case using "ip netmask" format rather than CIDR
-   done
+      mgmt_ip=$(echo "${ip}" | cut '-d ' -f1)   # In case using "ip netmask" format rather than CIDR
+   # done
    IFS="$SAVE_IFS"
 else
    mgmt_ip=$(echo "${ip}" | cut '-d ' -f1) # In case using "ip netmask" format rather than CIDR
@@ -114,30 +114,31 @@ startJail() {
 deleteJail() {
 # Unmount the jail's mountpoints if necessary
    cat <<EOF
-      output="\$(mount | grep "\\/${name}\\/dev")" || true
+      output="\$(mount | grep "\/${name}\/dev")" || true
       if [ -n "\${output}" ]; then # /dev is still mounted...jail still running?
          /etc/rc.d/jail stop "${name}"
       fi
-      output="\$(mount | grep "\\/rw\\/${name}\\/")" || true
+      output="\$(mount | grep "\/rw\/${name}\/")" || true
       if [ -n "\${output}" ]; then # >=1 rw mount is mounted still
-         for DIR in "\${output}"; do
-            umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print \$3}')"
+         for DIR in "${output}"; do
+            umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print $3}')"
          done
       fi
-      output="\$(mount | grep "\\/${name} (")" || true
+      output="\$(mount | grep "\/${name} (")" || true
       if [ -n "\${output}" ]; then # ro mount is mounted still
-         umount -F "/etc/fstab.${name}" "\$(echo "\${output}" | awk '{print \$3}')"
+         umount -F "/etc/fstab.${name}" "\$(echo "${output}" | awk '{print $3}')"
       fi
 EOF
 # Remove the jail's rw mountpoints
-   echo "rm -rf \"${jaildir}/rw/${name}\""
+   echo "rm -rf '${jaildir}/rw/${name}'"
 # Remove the jail directory
-   echo "rm -rf \"${jaildir}/${name}\""
+   echo "rm -rf '${jaildir}/${name}'"
 # Remove the jail's fstab
-   echo "rm -f \"/etc/fstab.${name}\""
+   echo "rm -f '/etc/fstab.${name}'"
 # Remove jail entry from jail.conf
    cat <<EOF
-      sed -i .bak -E -e "/^${name} {\$/,/^}\\\$/d" /etc/jail.conf
+      mv /etc/jail.conf /etc/jail.conf.bak
+      sed -E -e "/^${name} {\$/,/^}\\\$/d" /etc/jail.conf.bak > /etc/jail.conf
       if [ -f "/etc/jail.conf.bak" ]; then
          rm -f "/etc/jail.conf.bak"
       fi
@@ -153,7 +154,8 @@ EOF
       done
       jail_list="\${new_list}"
       
-      sed -i '.bak' "s/^jail_list=\".*\"/jail_list=\"\${jail_list}\"/" /etc/rc.conf
+      mv /etc/rc.conf /etc/rc.conf.bak
+      sed "s/^jail_list=\".*\"/jail_list=\"\${jail_list}\"/" /etc/rc.conf.bak > /etc/rc.conf
       unset jail_list
       if [ -f "/etc/rc.conf.bak" ]; then
          rm -f /etc/rc.conf.bak
@@ -239,7 +241,8 @@ cat <<EOF
    if [ -z "\$jail_enable" ]; then	# no jail_enable line in rc.conf at all
       echo "jail_enable=\"YES\"" >>/etc/rc.conf
    elif [ ! "\$(echo \$jail_enable | tr '[a-z]' '[A-Z]' | tr -d '"')" = "YES" ]; then	# jail_enable="NO"
-      sed -i '.bak' 's/^jail_enable=.*$/jail_enable="YES"/g' /etc/rc.conf	# fix this -^
+      mv /etc/rc.conf /etc/rc.conf.bak
+      sed 's/^jail_enable=.*$/jail_enable="YES"/g' /etc/rc.conf.bak > /etc/rc.conf	# fix this -^
       rm -f /etc/rc.conf.bak
    fi
 
@@ -275,9 +278,9 @@ cat <<EOF
       if [ ! -f /etc/devfs.rules ]; then
          touch /etc/devfs.rules
       fi
-      if [ -z "\$(grep '\\[jailrules=' /etc/devfs.rules)" ]; then   # The default ruleset doesn't exist
+      if [ -z "\$(grep '\[jailrules=' /etc/devfs.rules)" ]; then   # The default ruleset doesn't exist
          # Get the highest-numbered ruleset
-         highest="\$(sed -n 's/\\[.*=\\([0-9]*\\)\\]/\\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true
+         highest="\$(sed -n 's/\[.*=\([0-9]*\)\]/\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true
          # increment by 1
          [ -z "\$highest" ] && highest=10
          let num="\${highest}+1" 2>&1 >/dev/null   # Close the FD==fail...
@@ -290,7 +293,7 @@ add include \\\$devfsrules_unhide_basic
 add include \\\$devfsrules_unhide_login
 END
       fi
-      devfsruleset_num=\$(grep "\\[${devfsruleset}=" /etc/devfs.rules | sed -n 's/\\[.*=\\([0-9]*\\)\\]/\\1/pg')
+      devfsruleset_num=\$(grep "\[${devfsruleset}=" /etc/devfs.rules | sed -n 's/\[.*=\([0-9]*\)\]/\1/pg')
       if [ -n "\$devfsruleset_num" ]; then
          jaildata="\$jaildata
          devfs_ruleset=\"\${devfsruleset_num}\";"
@@ -298,8 +301,8 @@ END
    fi
 
 EOF
-   # shellcheck disable=SC2028
-   echo "printf \"%s\\n%s\\n%s\\n\" \"\$jailheader\" \"\$jaildata\" \"\$jailtrailer\" >>\"\$jailfile\""
+
+   echo "printf \"%s\\n%s\n%s\n\" \"\$jailheader\" \"\$jaildata\" \"\$jailtrailer\" >>\"\$jailfile\""
 
 # Add $name to jail_list if $onboot=yes
 if [ "$onboot" = "yes" ]; then
@@ -313,7 +316,8 @@ if [ "$onboot" = "yes" ]; then
          echo "jail_list=\"${name}\"" >>/etc/rc.conf
       else
          jail_list="\${jail_list} ${name}"
-         sed -i '.bak' "s/^jail_list=\".*\"/jail_list=\"\${jail_list}\"/" /etc/rc.conf
+         mv /etc/rc.conf /etc/rc.conf.bak
+         sed "s/^jail_list=\".*\"/jail_list=\"\${jail_list}\"/" /etc/rc.conf.bak > /etc/rc.conf
          rm -f /etc/rc.conf.bak
       fi
       unset jail_list
diff --git a/cdist/conf/type/__jail_freebsd9/explorer/status b/cdist/conf/type/__jail_freebsd9/explorer/status
index c8039f21..1ceba212 100755
--- a/cdist/conf/type/__jail_freebsd9/explorer/status
+++ b/cdist/conf/type/__jail_freebsd9/explorer/status
@@ -39,7 +39,7 @@ fi
 # backslash-escaped $jaildir
 sjaildir="$(echo ${jaildir} | sed 's#/#\\/#g')"
 
-jls_output="$(jls | grep "[ 	]${sjaildir}\\/${name}\$")" || true
+jls_output="$(jls | grep "[ 	]${sjaildir}\/${name}\$")" || true
 
 if [ -n "${jls_output}" ]; then
    echo "STARTED"
diff --git a/cdist/conf/type/__jail_freebsd9/gencode-remote b/cdist/conf/type/__jail_freebsd9/gencode-remote
index 68229d3e..1f99dcac 100755
--- a/cdist/conf/type/__jail_freebsd9/gencode-remote
+++ b/cdist/conf/type/__jail_freebsd9/gencode-remote
@@ -36,7 +36,7 @@ state="$(cat "$__object/parameter/state")"
 
 started="true"
 # If the user wants the jail gone, it implies it shouldn't be started.
-{ [ -f "$__object/parameter/stopped" ] || [ "$state" = "absent" ]; } && started="false"
+([ -f "$__object/parameter/stopped" ] || [ "$state" = "absent" ]) && started="false"
 
 if [ -f "$__object/parameter/ip" ]; then
    ip="$(cat "$__object/parameter/ip")"
@@ -45,7 +45,7 @@ else
 #    when $state=present, it's required. Enforce this.
    if [ "$state" = "present" ]; then
       exec >&2
-      printf 'If --state is "present", --ip must be given\!\n'
+      echo "If --state is 'present,' --ip must be given\!"
       exit 1
    fi
 fi
@@ -91,10 +91,10 @@ if [ "$(expr "${ip}" : ".*|.*")" -gt "0" ]; then
    interface=""
    SAVE_IFS="$IFS"
    IFS=", "
-   for cur_ip in ${ip}; do
+   # for cur_ip in ${ip}; do
       # Just get the last IP address for SSH to listen on
-      mgmt_ip=$(echo "${cur_ip}" | sed -E -e 's/^.*\|(.*)\/[0-9]+$/\1/')
-   done
+      mgmt_ip=$(echo "${ip}" | sed -E -e 's/^.*\|(.*)\/[0-9]+$/\1/')
+   # done
    IFS="$SAVE_IFS"
 else
    mgmt_ip=$(echo "${ip}" | cut '-d ' -f1)
@@ -119,30 +119,31 @@ startJail() {
 deleteJail() {
 # Unmount the jail's mountpoints if necessary
    cat <<EOF
-      output="\$(mount | grep "\\/${name}\\/dev")" || true
+      output="\$(mount | grep "\/${name}\/dev")" || true
       if [ -n "\${output}" ]; then # /dev is still mounted...jail still running?
          /etc/rc.d/jail stop "${name}"
       fi
-      output="\$(mount | grep "\\/rw\\/${name}\\/")" || true
+      output="\$(mount | grep "\/rw\/${name}\/")" || true
       if [ -n "\${output}" ]; then # >=1 rw mount is mounted still
-         for DIR in "\${output}"; do
-            umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print \$3}')"
+         for DIR in "${output}"; do
+            umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print $3}')"
          done
       fi
-      output="\$(mount | grep "\\/${name} (")" || true
+      output="\$(mount | grep "\/${name} (")" || true
       if [ -n "\${output}" ]; then # ro mount is mounted still
-         umount -F "/etc/fstab.${name}" "\$(echo "\${output}" | awk '{print \$3}')"
+         umount -F "/etc/fstab.${name}" "\$(echo "${output}" | awk '{print $3}')"
       fi
 EOF
 # Remove the jail's rw mountpoints
-   echo "rm -rf \"${jaildir}/rw/${name}\""
+   echo "rm -rf '${jaildir}/rw/${name}'"
 # Remove the jail directory
-   echo "rm -rf \"${jaildir}/${name}\""
+   echo "rm -rf '${jaildir}/${name}'"
 # Remove the jail's fstab
-   echo "rm -f \"/etc/fstab.${name}\""
+   echo "rm -f '/etc/fstab.${name}'"
 # Remove jail_$name_* lines from rc.conf
    cat <<EOF
-      sed -i '.bak' "/^jail_${name}_/d" /etc/rc.conf
+      mv /etc/rc.conf /etc/rc.conf.bak
+      sed "/^jail_${name}_/d" /etc/rc.conf.bak > /etc/rc.conf
       if [ -f "/etc/rc.conf.bak" ]; then
          rm -f /etc/rc.conf.bak
       fi
@@ -158,7 +159,8 @@ EOF
       done
       jail_list="\${new_list}"
       
-      sed -i '.bak' "s/^jail_list=\".*\"/jail_list=\"\${jail_list}\"/" /etc/rc.conf
+      mv /etc/rc.conf /etc/rc.conf.bak
+      sed "s/^jail_list=\".*\"/jail_list=\"\${jail_list}\"/" /etc/rc.conf.bak > /etc/rc.conf
       unset jail_list
       if [ -f "/etc/rc.conf.bak" ]; then
          rm -f /etc/rc.conf.bak
@@ -241,7 +243,8 @@ cat <<EOF
    if [ -z "\$jail_enable" ]; then	# no jail_enable line in rc.conf at all
       echo "jail_enable=\"YES\"" >>/etc/rc.conf
    elif [ ! "\$(echo \$jail_enable | tr '[a-z]' '[A-Z]')" = "YES" ]; then	# jail_enable="NO"
-      sed -i '.bak' 's/^jail_enable=.*$/jail_enable="YES"/g' /etc/rc.conf	# fix this -^
+      mv /etc/rc.conf /etc/rc.conf.bak
+      sed 's/^jail_enable=.*$/jail_enable="YES"/g' /etc/rc.conf.bak > /etc/rc.conf	# fix this -^
       rm -f /etc/rc.conf.bak
    fi
    cat >>/etc/rc.conf <<END
@@ -279,9 +282,9 @@ END
       if [ ! -f /etc/devfs.rules ]; then
          touch /etc/devfs.rules
       fi
-      if [ -z "\$(grep '\\[jailrules=' /etc/devfs.rules)" ]; then   # The default ruleset doesn't exist
+      if [ -z "\$(grep '\[jailrules=' /etc/devfs.rules)" ]; then   # The default ruleset doesn't exist
          # Get the highest-numbered ruleset
-	 highest="\$(sed -n 's/\\[.*=\\([0-9]*\\)\\]/\\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true
+	 highest="\$(sed -n 's/\[.*=\([0-9]*\)\]/\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true
          # increment by 1
          let num="\${highest}+1" 2>&- >&-
          # add default ruleset
@@ -309,7 +312,8 @@ if [ "$onboot" = "yes" ]; then
          echo "jail_list=\"${name}\"" >>/etc/rc.conf
       else
          jail_list="\${jail_list} ${name}"
-         sed -i '.bak' "s/^jail_list=\".*\"/jail_list=\"\${jail_list}\"/" /etc/rc.conf
+         mv /etc/rc.conf /etc/rc.conf.bak
+         sed "s/^jail_list=\".*\"/jail_list=\"\${jail_list}\"/" /etc/rc.conf.bak > /etc/rc.conf
          rm -f /etc/rc.conf.bak
       fi
       unset jail_list
diff --git a/cdist/conf/type/__key_value/explorer/state b/cdist/conf/type/__key_value/explorer/state
index 7b2de1df..b990733d 100755
--- a/cdist/conf/type/__key_value/explorer/state
+++ b/cdist/conf/type/__key_value/explorer/state
@@ -19,9 +19,9 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-key="$(cat "$__object/parameter/key" 2>/dev/null \
+export key="$(cat "$__object/parameter/key" 2>/dev/null \
    || echo "$__object_id")"
-state="$(cat "$__object/parameter/state")"
+export state="$(cat "$__object/parameter/state")"
 
 file="$(cat "$__object/parameter/file")"
 
@@ -30,15 +30,14 @@ if [ ! -f "$file" ]; then
     exit
 fi
 
-delimiter="$(cat "$__object/parameter/delimiter")"
-value="$(cat "$__object/parameter/value" 2>/dev/null \
+export delimiter="$(cat "$__object/parameter/delimiter")"
+export value="$(cat "$__object/parameter/value" 2>/dev/null \
    || echo "__CDIST_NOTSET__")"
 if [ -f "$__object/parameter/exact_delimiter" ]; then
-    exact_delimiter=1
+    export exact_delimiter=1
 else
-    exact_delimiter=0
+    export exact_delimiter=0
 fi
-export key state delimiter value exact_delimiter
 
 awk -f - "$file" <<"AWK_EOF"
 BEGIN {
diff --git a/cdist/conf/type/__key_value/files/remote_script.sh b/cdist/conf/type/__key_value/files/remote_script.sh
index f7a1add5..52b3f2de 100644
--- a/cdist/conf/type/__key_value/files/remote_script.sh
+++ b/cdist/conf/type/__key_value/files/remote_script.sh
@@ -1,21 +1,19 @@
 #!/bin/sh
 
-key="$(cat "$__object/parameter/key" 2>/dev/null \
+export key="$(cat "$__object/parameter/key" 2>/dev/null \
    || echo "$__object_id")"
-state="$(cat "$__object/parameter/state")"
+export state="$(cat "$__object/parameter/state")"
 
 file="$(cat "$__object/parameter/file")"
 
-delimiter="$(cat "$__object/parameter/delimiter")"
-value="$(cat "$__object/parameter/value" 2>/dev/null \
+export delimiter="$(cat "$__object/parameter/delimiter")"
+export value="$(cat "$__object/parameter/value" 2>/dev/null \
    || echo "__CDIST_NOTSET__")"
-export key state delimiter value
 if [ -f "$__object/parameter/exact_delimiter" ]; then
-    exact_delimiter=1
+    export exact_delimiter=1
 else
-    exact_delimiter=0
+    export exact_delimiter=0
 fi
-export exact_delimiter
 
 tmpfile=$(mktemp "${file}.cdist.XXXXXXXXXX")
 # preserve ownership and permissions by copying existing file over tmpfile
diff --git a/cdist/conf/type/__keyboard/manifest b/cdist/conf/type/__keyboard/manifest
index 80cd4819..e7591cbc 100755
--- a/cdist/conf/type/__keyboard/manifest
+++ b/cdist/conf/type/__keyboard/manifest
@@ -34,13 +34,13 @@ case "$os" in
             __key_value KEYTABLE \
                 --file /etc/sysconfig/keyboard \
                 --delimiter '=' \
-                --value "\"$keyboard_type\""
+                --value "'$keyboard_type'"
         
         require="__file/etc/sysconfig/keyboard" \
             __key_value LAYOUT \
                 --file /etc/sysconfig/keyboard \
                 --delimiter '=' \
-                --value "\"$keyboard_type\""
+                --value "'$keyboard_type'"
     ;;
     *)
       echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
diff --git a/cdist/conf/type/__letsencrypt_cert/manifest b/cdist/conf/type/__letsencrypt_cert/manifest
index d598949e..56e3532c 100755
--- a/cdist/conf/type/__letsencrypt_cert/manifest
+++ b/cdist/conf/type/__letsencrypt_cert/manifest
@@ -62,12 +62,11 @@ if [ -z "${certbot_fullpath}" ]; then
 								 --distribution ascii-backports \
 								 --component main
 
+					require="__apt_source/ascii-backports" __package_apt python-certbot \
+						--target-release ascii-backports
 					require="__apt_source/ascii-backports" __package_apt certbot \
 						--target-release ascii-backports
 				;;
-				bewoulf*)
-					__package_apt certbot
-				;;
 				*)
 					echo "Unsupported OS version: $os_version" >&2
 					exit 1
@@ -92,7 +91,7 @@ if [ -f "${__object}/parameter/automatic-renewal" ]; then
 	renew_hook_param="${__object}/parameter/renew-hook"
 	renew_hook=""
 	if [ -f "${renew_hook_param}" ]; then
-		while read -r hook; do
+		while read hook; do
 			renew_hook="${renew_hook} --renew-hook \"${hook}\""
 		done < "${renew_hook_param}"
 	fi
diff --git a/cdist/conf/type/__line/gencode-remote b/cdist/conf/type/__line/gencode-remote
index 03e90c1b..996029f5 100755
--- a/cdist/conf/type/__line/gencode-remote
+++ b/cdist/conf/type/__line/gencode-remote
@@ -18,7 +18,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-if [ -f "$__object/parameter/before" ] && [ -f "$__object/parameter/after" ]; then
+if [ -f "$__object/parameter/before" -a -f "$__object/parameter/after" ]; then
    echo "Use either --before OR --after but not both." >&2
    exit 1
 fi
@@ -122,7 +122,3 @@ END {
 ' "$file" > "\$tmpfile"
 mv -f "\$tmpfile" "$file"
 DONE
-
-if [ -f "$__object/parameter/onchange" ]; then
-   cat "$__object/parameter/onchange"
-fi
diff --git a/cdist/conf/type/__line/man.rst b/cdist/conf/type/__line/man.rst
index f76cab64..d651985e 100644
--- a/cdist/conf/type/__line/man.rst
+++ b/cdist/conf/type/__line/man.rst
@@ -46,8 +46,6 @@ regex
 state
     'present' or 'absent', defaults to 'present'
 
-onchange
-    The code to run if line is added, removed or updated.
 
 
 BOOLEAN PARAMETERS
diff --git a/cdist/conf/type/__line/parameter/optional b/cdist/conf/type/__line/parameter/optional
index 1c34c699..f89a2115 100644
--- a/cdist/conf/type/__line/parameter/optional
+++ b/cdist/conf/type/__line/parameter/optional
@@ -4,4 +4,3 @@ file
 line
 regex
 state
-onchange
diff --git a/cdist/conf/type/__link/explorer/state b/cdist/conf/type/__link/explorer/state
index 7150df25..b8d8fc2b 100755
--- a/cdist/conf/type/__link/explorer/state
+++ b/cdist/conf/type/__link/explorer/state
@@ -32,9 +32,9 @@ destination_dir="${destination%/*}"
 
 case "$type" in
    symbolic)
-      cd "$destination_dir" || exit 1
+      cd "$destination_dir"
+      source_is=$(ls -l "$destination" | sed 's/.*-> //g')
       if [ -h "$destination" ]; then
-         source_is=$(readlink "$destination")
          # ignore trailing slashes for comparison
          if [ "${source_is%/}" = "${source%/}" ]; then
             echo present
@@ -46,19 +46,13 @@ case "$type" in
       fi
    ;;
    hard)
-      cd "$destination_dir" || exit 1
+      cd "$destination_dir"
       # check source relative to destination_dir
       if [ ! -e "$source" ]; then
          echo sourcemissing
          exit 0
       fi
-      # Currently not worth the effor to change it, stat is not defined by POSIX
-      # and different OSes has different implementations for it.
-      # shellcheck disable=SC2012
       destination_inode=$(ls -i "$destination" | awk '{print $1}')
-      # Currently not worth the effor to change it, stat is not defined by POSIX
-      # and different OSes has different implementations for it.
-      # shellcheck disable=SC2012
       source_inode=$(ls -i "$source" | awk '{print $1}')
       if [ "$destination_inode" -eq "$source_inode" ]; then
          echo present
diff --git a/cdist/conf/type/__link/explorer/type b/cdist/conf/type/__link/explorer/type
index b322bf42..48a79bf0 100755
--- a/cdist/conf/type/__link/explorer/type
+++ b/cdist/conf/type/__link/explorer/type
@@ -24,26 +24,23 @@
 destination="/$__object_id"
 
 if [ ! -e "$destination" ]; then
-    echo none
+   echo none
 elif [ -h "$destination" ]; then
-    echo symlink
+   echo symlink
 elif [ -f "$destination" ]; then
-    type="$(cat "$__object/parameter/type")"
-    case "$type" in
-        hard)
-            # Currently not worth the effor to change it, stat is not defined by POSIX
-            # and different OSes has different implementations for it.
-            # shellcheck disable=SC2012
-            link_count=$(ls -l "$destination" | awk '{ print $2 }')
-            if [ "$link_count" -gt 1 ]; then
-                echo hardlink
-                exit 0
-            fi
-        ;;
-    esac
-    echo file
+   type="$(cat "$__object/parameter/type")"
+   case "$type" in
+      hard)
+         link_count=$(ls -l "$destination" | awk '{ print $2 }')
+         if [ "$link_count" -gt 1 ]; then
+            echo hardlink
+            exit 0
+         fi
+      ;;
+   esac
+   echo file
 elif [ -d "$destination" ]; then
-    echo directory
+   echo directory
 else
-    echo unknown
+   echo unknown
 fi
diff --git a/cdist/conf/type/__link/gencode-remote b/cdist/conf/type/__link/gencode-remote
index 45c22fcc..dc7f3193 100755
--- a/cdist/conf/type/__link/gencode-remote
+++ b/cdist/conf/type/__link/gencode-remote
@@ -48,25 +48,21 @@ case "$state_should" in
         if [ "$file_type" = "directory" ]; then
             # our destination is currently a directory, delete it
             printf 'rm -rf "%s" &&\n' "$destination"
-            echo "removed '$destination' (directory)" >> "$__messages_out"
         else
            if [ "$state_is" = "wrongsource" ]; then
                # our destination is a symlink but points to the wrong source,
                # delete it
                printf 'rm -f "%s" &&\n' "$destination"
-               echo "removed '$destination' (wrongsource)" >> "$__messages_out"
            fi
         fi
 
         # create our link
         printf 'ln %s -f "%s" "%s"\n' "$lnopt" "$source" "$destination"
-        echo "created '$destination'" >> "$__messages_out"
     ;;
     absent)
         # only delete if it is a sym/hard link
         if [ "$file_type" = "symlink" ] || [ "$file_type" = "hardlink" ]; then
             printf 'rm -f "%s"\n' "$destination"
-            echo "removed '$destination'" >> "$__messages_out"
         fi
     ;;
     *)
diff --git a/cdist/conf/type/__link/man.rst b/cdist/conf/type/__link/man.rst
index fe0ce425..9dc4665f 100644
--- a/cdist/conf/type/__link/man.rst
+++ b/cdist/conf/type/__link/man.rst
@@ -27,22 +27,6 @@ state
    'present' or 'absent', defaults to 'present'
 
 
-MESSAGES
---------
-
-created <destination>
-   Link to destination was created.
-
-removed <destination>
-   Link to destination was removed.
-
-removed <destination> (directory)
-   Destination was removed because state is ``present`` and destination was directory.
-
-removed <destination> (wrongsource)
-   Destination was removed because state is ``present`` and destination link source was wrong.
-
-
 EXAMPLES
 --------
 
diff --git a/cdist/conf/type/__locale/gencode-remote b/cdist/conf/type/__locale/gencode-remote
index 1feb9884..04e48712 100755
--- a/cdist/conf/type/__locale/gencode-remote
+++ b/cdist/conf/type/__locale/gencode-remote
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# 2013-2019 Nico Schottelius (nico-cdist at schottelius.org)
+# 2013 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -37,15 +37,6 @@ locale_remove=$(echo "$locale" | sed 's/UTF-8/utf8/')
 
 state=$(cat "$__object/parameter/state")
 
-os=$(cat "$__global/explorer/os")
-
-# Nothing to be done on alpine
-case "$os" in
-    alpine)
-        exit 0
-        ;;
-esac
-
 case "$state" in
     present)
         echo localedef -A "$alias" -f "$charmap" -i "$input" "$locale"
diff --git a/cdist/conf/type/__locale/man.rst b/cdist/conf/type/__locale/man.rst
index e36ab061..60a4eacc 100644
--- a/cdist/conf/type/__locale/man.rst
+++ b/cdist/conf/type/__locale/man.rst
@@ -8,8 +8,7 @@ cdist-type__locale - Configure locales
 
 DESCRIPTION
 -----------
-This cdist type allows you to setup locales. On systems that don't
-support locale setting like alpine/musl libc, it is a no-op.
+This cdist type allows you to setup locales.
 
 
 OPTIONAL PARAMETERS
@@ -45,6 +44,6 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2013-2019 Nico Schottelius. Free use of this software is
+Copyright \(C) 2013-2016 Nico Schottelius. Free use of this software is
 granted under the terms of the GNU General Public License version 3 or
 later (GPLv3+).
diff --git a/cdist/conf/type/__locale/manifest b/cdist/conf/type/__locale/manifest
index 9f1e17ac..cacd0b42 100755
--- a/cdist/conf/type/__locale/manifest
+++ b/cdist/conf/type/__locale/manifest
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# 2013-2019 Nico Schottelius (nico-cdist at schottelius.org)
+# 2013-2015 Nico Schottelius (nico-cdist at schottelius.org)
 # 2015 David Hürlimann (david at ungleich.ch)
 #
 # This file is part of cdist.
@@ -19,7 +19,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Install required packages
+# Install required packages 
 #
 
 os=$(cat "$__global/explorer/os")
@@ -30,7 +30,7 @@ case "$os" in
         # Debian needs a seperate package
         __package locales --state present
     ;;
-    archlinux|suse|ubuntu|scientific|centos|alpine)
+    archlinux|suse|ubuntu|scientific|centos)
         :
     ;;
     *)
diff --git a/cdist/conf/type/__mount/gencode-remote b/cdist/conf/type/__mount/gencode-remote
index b2096764..66d85f88 100755
--- a/cdist/conf/type/__mount/gencode-remote
+++ b/cdist/conf/type/__mount/gencode-remote
@@ -39,7 +39,7 @@ case "$state_should" in
             printf ' -o %s' "$(cat "$__object/parameter/options")"
          fi
          printf ' %s' "$(cat "$__object/parameter/device")"
-         printf ' %s\n' "$path"
+         printf " %s\n" "$path"
       else
          # mount using existing fstab entry
          printf 'mount "%s"\n' "$path"
diff --git a/cdist/conf/type/__mount/manifest b/cdist/conf/type/__mount/manifest
index 999d806c..73937899 100755
--- a/cdist/conf/type/__mount/manifest
+++ b/cdist/conf/type/__mount/manifest
@@ -31,7 +31,7 @@ printf " %s" "$type"
 options="$(cat "$__object/parameter/options")"
 printf " %s" "$options"
 printf " %s" "$(cat "$__object/parameter/dump")"
-printf ' %s\n' "$(cat "$__object/parameter/pass")"
+printf " %s\n" "$(cat "$__object/parameter/pass")"
 ) | \
 __block "$__object_name" \
    --file "/etc/fstab" \
diff --git a/cdist/conf/type/__package/explorer/pkgng_exists b/cdist/conf/type/__package/explorer/pkgng_exists
index 6d69ba14..8c666465 100755
--- a/cdist/conf/type/__package/explorer/pkgng_exists
+++ b/cdist/conf/type/__package/explorer/pkgng_exists
@@ -21,7 +21,7 @@
 # Retrieve the status of a package - parsed dpkg output
 #
 
-if [ "$("$__explorer/os")" = "freebsd" ]; then
+if [ "$("${__explorer}"/os)" = "freebsd" ]; then
    command -v pkg
 fi
 
diff --git a/cdist/conf/type/__package/manifest b/cdist/conf/type/__package/manifest
index a453c32b..f9de1145 100755
--- a/cdist/conf/type/__package/manifest
+++ b/cdist/conf/type/__package/manifest
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -45,7 +44,6 @@ else
          suse) type="zypper" ;;
          openwrt) type="opkg" ;;
          openbsd) type="pkg_openbsd" ;;
-         alpine) type="apk" ;;
          *)
             echo "Don't know how to manage packages on: $os" >&2
             exit 1
diff --git a/cdist/conf/type/__package_apk/gencode-remote b/cdist/conf/type/__package_apk/gencode-remote
deleted file mode 100755
index 79e3d2b6..00000000
--- a/cdist/conf/type/__package_apk/gencode-remote
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Manage packages on Debian and co.
-#
-
-if [ -f "$__object/parameter/name" ]; then
-   name="$(cat "$__object/parameter/name")"
-else
-   name="$__object_id"
-fi
-
-state_should="$(cat "$__object/parameter/state")"
-state_is="$(cat "$__object/explorer/state")"
-
-# Nothing to be done
-[ "$state_is" = "$state_should" ] && exit 0
-
-case "$state_should" in
-    present)
-        echo "apk add -q '$name'"
-        echo "installed" >> "$__messages_out"
-    ;;
-    absent)
-        echo "apk del -q '$name'"
-        echo "removed" >> "$__messages_out"
-    ;;
-    *)
-        echo "Unknown state: $state_should" >&2
-        exit 1
-    ;;
-esac
diff --git a/cdist/conf/type/__package_apk/man.rst b/cdist/conf/type/__package_apk/man.rst
deleted file mode 100644
index bc2408b4..00000000
--- a/cdist/conf/type/__package_apk/man.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-cdist-type__package_akp(7)
-==========================
-
-NAME
-----
-cdist-type__package_akp - Manage packages with akp
-
-
-DESCRIPTION
------------
-apk is usually used on Alpine to manage packages.
-
-
-REQUIRED PARAMETERS
--------------------
-None
-
-
-OPTIONAL PARAMETERS
--------------------
-name
-   If supplied, use the name and not the object id as the package name.
-
-state
-    Either "present" or "absent", defaults to "present"
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # Ensure zsh in installed
-    __package_apk zsh --state present
-
-    # Remove package
-    __package_apk apache2 --state absent
-
-
-SEE ALSO
---------
-:strong:`cdist-type__package`\ (7)
-
-
-AUTHORS
--------
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
-
-COPYING
--------
-Copyright \(C) 2019 Nico Schottelius. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__package_apk/nonparallel b/cdist/conf/type/__package_apk/nonparallel
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__package_apk/parameter/default/state b/cdist/conf/type/__package_apk/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__package_apk/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__package_apk/parameter/optional b/cdist/conf/type/__package_apk/parameter/optional
deleted file mode 100644
index 1b423dc4..00000000
--- a/cdist/conf/type/__package_apk/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-name
-state
diff --git a/cdist/conf/type/__package_apt/gencode-remote b/cdist/conf/type/__package_apt/gencode-remote
index 699eb0c9..e1477db4 100755
--- a/cdist/conf/type/__package_apt/gencode-remote
+++ b/cdist/conf/type/__package_apt/gencode-remote
@@ -64,7 +64,7 @@ esac
 
 # Hint if we need to avoid questions at some point:
 # DEBIAN_PRIORITY=critical can reduce the number of questions
-aptget="DEBIAN_FRONTEND=noninteractive apt-get --quiet --yes --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\""
+aptget="DEBIAN_FRONTEND=noninteractive apt-get --quiet --yes --no-install-recommends -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"
 
 if [ "$state_is" = "$state_should" ]; then
     if [ -z "$version" ] || [ "$version" = "$version_is" ]; then
@@ -77,11 +77,11 @@ case "$state_should" in
         if [ -n "$version" ]; then
             name="${name}=${version}"
         fi
-        echo "$aptget install $target_release '$name'"
+        echo "$aptget install $target_release \"$name\""
         echo "installed" >> "$__messages_out"
     ;;
     absent)
-        echo "$aptget remove $purgeparam '$name'"
+        echo "$aptget remove $purgeparam \"$name\""
         echo "removed" >> "$__messages_out"
     ;;
     *)
diff --git a/cdist/conf/type/__package_emerge/explorer/pkg_version b/cdist/conf/type/__package_emerge/explorer/pkg_version
index d02b9d6b..7053eaff 100644
--- a/cdist/conf/type/__package_emerge/explorer/pkg_version
+++ b/cdist/conf/type/__package_emerge/explorer/pkg_version
@@ -32,5 +32,4 @@ else
    name="$__object_id"
 fi
 
-# shellcheck disable=SC2016
 equery -q l -F '$cp $fullversion' "$name" || true
diff --git a/cdist/conf/type/__package_emerge/gencode-remote b/cdist/conf/type/__package_emerge/gencode-remote
index e1b85ebb..c8a79c1f 100755
--- a/cdist/conf/type/__package_emerge/gencode-remote
+++ b/cdist/conf/type/__package_emerge/gencode-remote
@@ -39,12 +39,12 @@ pkg_version="$(cat "$__object/explorer/pkg_version")"
 if [ -z "$pkg_version" ]; then
     state_is="absent"
 elif [ -z "$version" ] && [ "$(echo "$pkg_version" | wc -l)" -gt 1 ]; then
-    echo "Package name is not unique! The following packages are installed:" >&2
-    echo "$pkg_version" >&2
+    echo "Package name is not unique! The following packages are installed:"
+    echo "$pkg_version"
     exit 1
 elif [ -n "$version" ] && [ "$(echo "$pkg_version" | cut -d " " -f 1 | sort | uniq | wc -l)" -gt 1 ]; then
-    echo "Package name is not unique! The following packages are installed:" >&2
-    echo "$pkg_version" >&2
+    echo "Package name is not unique! The following packages are installed:"
+    echo "$pkg_version"
     exit 1
 else
     state_is="present"
@@ -57,18 +57,16 @@ fi
 
 
 # Exit if nothing is needed to be done
-[ "$state_is" = "$state_should" ] && { [ -z "$version" ] || [ "$installed_version" = "$version" ]; } && exit 0
-[ "$state_should" = "absent" ] && [ -n "$version" ] && [ "$installed_version" != "$version" ] && exit 0
+[ "$state_is" = "$state_should" ] && ( [ -z "$version" ] || [ "$installed_version" = "$version" ] ) && exit 0
+[ "$state_should" = "absent" ] && [ ! -z "$version" ] && [ "$installed_version" != "$version" ] && exit 0
 
 
 case "$state_should" in
    present)
         echo "emerge '$name' &>/dev/null || exit 1"
-        echo "installed" >> "$__messages_out"
         ;;
    absent)
         echo "emerge -C '$name' &>/dev/null || exit 1"
-        echo "removed" >> "$__messages_out"
         ;;
    *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_emerge_dependencies/gencode-remote b/cdist/conf/type/__package_emerge_dependencies/gencode-remote
index f3e6f76e..face898a 100755
--- a/cdist/conf/type/__package_emerge_dependencies/gencode-remote
+++ b/cdist/conf/type/__package_emerge_dependencies/gencode-remote
@@ -6,11 +6,10 @@ flaggie_installed="$(cat "$__object/explorer/flaggie_installed")"
 if [ "${gentoolkit_installed}" != "true" ]; then
     # emerge app-portage/gentoolkit
     echo "emerge app-portage/gentoolkit &> /dev/null || exit 1"
-    echo "installed app-portage/gentoolkit" >> "$__messages_out"
 fi
 
 if [ "${flaggie_installed}" != "true" ]; then
     # emerge app-portage/flaggie
     echo "emerge app-portage/flaggie &> /dev/null || exit 1"
-    echo "installed app-portage/flaggie" >> "$__messages_out"
 fi
+
diff --git a/cdist/conf/type/__package_luarocks/explorer/pkg_status b/cdist/conf/type/__package_luarocks/explorer/pkg_status
index e83e8ce6..3eb73298 100755
--- a/cdist/conf/type/__package_luarocks/explorer/pkg_status
+++ b/cdist/conf/type/__package_luarocks/explorer/pkg_status
@@ -28,4 +28,4 @@ else
 fi
 
 # Accept luarocks failing if package is not known/installed
-luarocks list "$name" | grep -E -A1 "^$name$" || exit 0
+luarocks list "$name" | egrep -A1 "^$name$" || exit 0
diff --git a/cdist/conf/type/__package_luarocks/gencode-remote b/cdist/conf/type/__package_luarocks/gencode-remote
index d83b3c3a..60b9bfea 100755
--- a/cdist/conf/type/__package_luarocks/gencode-remote
+++ b/cdist/conf/type/__package_luarocks/gencode-remote
@@ -43,11 +43,9 @@ fi
 case "$state_should" in
     present)
         echo "luarocks install '$name'"
-        echo "installed" >> "$__messages_out"
     ;;
     absent)
         echo "luarocks remove '$name'"
-        echo "removed" >> "$__messages_out"
     ;;
     *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_opkg/gencode-remote b/cdist/conf/type/__package_opkg/gencode-remote
index 269d5f49..94dc2808 100755
--- a/cdist/conf/type/__package_opkg/gencode-remote
+++ b/cdist/conf/type/__package_opkg/gencode-remote
@@ -46,14 +46,12 @@ case "$state_should" in
             echo "opkg --verbosity=0 update"
         fi
         echo "opkg --verbosity=0 install '$name'"
-        echo "installed" >> "$__messages_out"
     ;;
     absent)
         echo "opkg --verbosity=0 remove '$name'"
-        echo "removed" >> "$__messages_out"
     ;;
     *)
-        echo "Unknown state: ${state_should}" >&2
+        echo "Unknown state: $state" >&2
         exit 1
     ;;
 esac
diff --git a/cdist/conf/type/__package_pacman/gencode-remote b/cdist/conf/type/__package_pacman/gencode-remote
index 2e076ec3..7ba85479 100755
--- a/cdist/conf/type/__package_pacman/gencode-remote
+++ b/cdist/conf/type/__package_pacman/gencode-remote
@@ -46,11 +46,9 @@ fi
 case "$state_should" in
    present)
          echo "pacman --needed --noconfirm --noprogressbar -S '$name'"
-         echo "installed" >> "$__messages_out"
    ;;
    absent)
          echo "pacman --noconfirm --noprogressbar -R '$name'"
-         echo "removed" >> "$__messages_out"
    ;;
    *)
       echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_pip/gencode-remote b/cdist/conf/type/__package_pip/gencode-remote
index dcc4fdf9..3390faeb 100755
--- a/cdist/conf/type/__package_pip/gencode-remote
+++ b/cdist/conf/type/__package_pip/gencode-remote
@@ -53,20 +53,18 @@ case "$state_should" in
     present)
         if [ "$runas" ]
         then
-            echo "su -c '$pip install -q $name' $runas"
+            echo "su -c '$pip install -q $name' '$runas'"
         else
             echo $pip install -q "$name"
         fi
-        echo "installed" >> "$__messages_out"
     ;;
     absent)
         if [ "$runas" ]
         then
-            echo "su -c '$pip uninstall -q -y $name' $runas"
+            echo "su -c '$pip uninstall -q -y $name' '$runas'"
         else
             echo $pip uninstall -q -y "$name"
         fi
-        echo "removed" >> "$__messages_out"
     ;;
     *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_pkg_freebsd/explorer/pkg_version b/cdist/conf/type/__package_pkg_freebsd/explorer/pkg_version
index 0a1ab75c..1ceaebe3 100755
--- a/cdist/conf/type/__package_pkg_freebsd/explorer/pkg_version
+++ b/cdist/conf/type/__package_pkg_freebsd/explorer/pkg_version
@@ -30,10 +30,10 @@ fi
 # Don't produce "no pkgs installed" output -- breaks things
 PKG_OUTPUT=$(pkg_info 2>&1)
 if [ ! "$PKG_OUTPUT" = "pkg_info: no packages installed" ]; then
-	printf "%s" "$(echo "$PKG_OUTPUT" \
+	printf "%s" "$PKG_OUTPUT" \
 		| awk '{print $1}' \
 		| sed 's/^\(.*\)-\([^-]*\)$/name:\1 ver:\2/g' \
 		| grep "name:$name ver:" \
-		| sed 's/^.*ver:\(.*\)/\1/g')"
+		| sed 's/^.*ver:\(.*\)/\1/g'
 fi
 
diff --git a/cdist/conf/type/__package_pkg_freebsd/gencode-remote b/cdist/conf/type/__package_pkg_freebsd/gencode-remote
index 3f88f6bc..a01ddc2f 100755
--- a/cdist/conf/type/__package_pkg_freebsd/gencode-remote
+++ b/cdist/conf/type/__package_pkg_freebsd/gencode-remote
@@ -23,23 +23,14 @@
 
 assert ()                 #  If condition false,
 {                         #+ exit from script with error message.
-	E_PARAM_ERR=98
 	E_ASSERT_FAILED=99
 
-	if [ -z "$2" ]          # Not enough parameters passed.
+	if [ ! "$1" ] 
 	then
-		return $E_PARAM_ERR   # No damage done.
-	fi
-
-	lineno=$2
-
-	if [ ! "$1" ]
-	then
-		echo "Assertion failed:  \"$1\""
-		# shellcheck disable=SC2039
-		echo "File \"$0\", line $lineno, called by $(caller 0)"
+		echo "Assertion failed:  '$1'"
+		echo "File '$0'"
 		exit $E_ASSERT_FAILED
-	fi
+	fi  
 }
 
 # Debug
@@ -73,12 +64,14 @@ execcmd(){
 		[ -n "$version" ] && pkgsite="${pkgsite}/All/" || pkgsite="${pkgsite}/Latest/"
 		echo "${pkgsite}"
 	fi
-	echo "${2} 2>&- >&-"	# Silence the output of the command
-	echo "status=\$?"
-	echo "if [ \"\$status\" -ne \"0\" ]; then"
-	echo "	echo \"Error: ${cmd} exited nonzero with \$status\"'!' >&2"
-	echo "	exit 1"
-	echo "fi"
+    cat <<EOF
+${2} 2>&- >&-  # Silence the output of the command
+status=\$?
+if [ "\$status" -ne "0" ]; then
+	echo "Error: ${cmd} exited nonzero with \$status!" >&2
+	exit 1
+fi
+EOF
 }
 
 if [ -n "$curr_version" ]; then	# PKG *is* installed
@@ -89,7 +82,6 @@ if [ -n "$curr_version" ]; then	# PKG *is* installed
 			cmd="${rm_cmd} ${name}-${curr_version}"
 		fi
 		execcmd "remove" "${cmd}"
-		echo "removed" >> "$__messages_out"
 		exit 0
 	else	# Should be installed
 		if [ -n "$version" ]; then	# Want a specific version
@@ -97,13 +89,11 @@ if [ -n "$curr_version" ]; then	# PKG *is* installed
 				exit 0
 			else	# Current version is wrong, fix
 				#updatepkg "$name" "$version"
-				# shellcheck disable=SC2039
-				assert "! ${version} = ${curr_version}" $LINENO
+				assert "! ${version} = ${curr_version}"
 				cmd="${rm_cmd} ${name}-${curr_version}"
 				execcmd "remove" "${cmd}"
 				cmd="${add_cmd} -r ${name}-${version}"
 				execcmd "add" "${cmd}"
-				echo "installed" >> "$__messages_out"
 			fi
 		else	# Don't care what version to use
 			exit 0
@@ -122,7 +112,6 @@ else	# PKG *isn't* installed
 			cmd="${cmd}-${version}"
 		fi
 		execcmd "add" "${cmd}"
-		echo "installed" >> "$__messages_out"
 		exit 0
 	fi
 fi
diff --git a/cdist/conf/type/__package_pkg_openbsd/explorer/pkg_state b/cdist/conf/type/__package_pkg_openbsd/explorer/pkg_state
deleted file mode 100755
index 9cd17787..00000000
--- a/cdist/conf/type/__package_pkg_openbsd/explorer/pkg_state
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2018, Takashi Yoshi <takashi@yoshi.email>
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Retrieve the status of a package - parsed pkg_info output
-#
-
-if [ -f "${__object}/parameter/name" ]
-then
-	pkgid="$(cat "${__object}/parameter/name")"
-else
-	pkgid="${__object_id}"
-fi
-
-if [ -f "${__object}/parameter/version" ]
-then
-	pkgid="${pkgid}-$(cat "${__object}/parameter/version")"
-fi
-
-if [ -f "${__object}/parameter/flavor" ]
-then
-	# If a flavor but no version is given we need to add another -,
-	# otherwise pkg_info confuses the flavor with the version.
-	[ -f "${__object}/parameter/version" ] || pkgid="${pkgid}-"
-
-	pkgid="${pkgid}-$(cat "${__object}/parameter/flavor")"
-fi
-
-
-pkg_info -q -I "inst:${pkgid}" >/dev/null 2>&1 \
-	&& echo 'present' || echo 'absent'
-
-exit 0
diff --git a/cdist/conf/type/__package_apk/explorer/state b/cdist/conf/type/__package_pkg_openbsd/explorer/pkg_version
similarity index 70%
rename from cdist/conf/type/__package_apk/explorer/state
rename to cdist/conf/type/__package_pkg_openbsd/explorer/pkg_version
index b477ca7c..212f0d96 100755
--- a/cdist/conf/type/__package_apk/explorer/state
+++ b/cdist/conf/type/__package_pkg_openbsd/explorer/pkg_version
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
+# 2011 Andi Brönnimann (andi-cdist at v-net.ch)
+# Copyright 2017, Philippe Gregoire <pg@pgregoire.xyz>
 #
 # This file is part of cdist.
 #
@@ -18,7 +19,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Retrieve the status of a package - parsed apk output
+# Retrieve the status of a package - parsed dpkg output
 #
 
 if [ -f "$__object/parameter/name" ]; then
@@ -27,12 +28,5 @@ else
    name="$__object_id"
 fi
 
-# Remove the @.. repo tag for finding out whether it is installed
-# f.i. pass@testing => pass
-name="$(echo "$name" | sed 's/@.*//')"
-
-if [ "$(apk list -I "$name")" ]; then
-    echo present
-else
-    echo absent
-fi
+#TODO: Is there a better way?
+pkg_info | grep "^$name-[0-9]" | sed 's|.*\(-[0-9][0-9.]*\).*|\1|' | sed 's/-//'
diff --git a/cdist/conf/type/__package_pkg_openbsd/gencode-remote b/cdist/conf/type/__package_pkg_openbsd/gencode-remote
index 5a21ce12..61383edb 100755
--- a/cdist/conf/type/__package_pkg_openbsd/gencode-remote
+++ b/cdist/conf/type/__package_pkg_openbsd/gencode-remote
@@ -2,7 +2,6 @@
 #
 # 2011 Andi Brönnimann (andi-cdist at v-net.ch)
 # 2012 Nico Schottelius (nico-cdist at schottelius.org)
-# 2018 Takashi Yoshi <takashi@yoshi.email>
 #
 # This file is part of cdist.
 #
@@ -23,96 +22,105 @@
 # Manage packages with pkg on OpenBSD
 #
 
-os_version=$(cat "${__global}/explorer/os_version")
-machine=$(cat "${__global}/explorer/machine")
+# Debug
+# exec >&2
+# set -x
 
-if [ -f "${__object}/parameter/version" ]; then
-	version=$(cat "${__object}/parameter/version")
+os_version="$(cat "$__global/explorer/os_version")"
+machine="$(cat "$__global/explorer/machine")"
+
+if [ -f "$__object/parameter/version" ]; then
+	version="$(cat "$__object/parameter/version")"
 fi
 
-if [ -f "${__object}/parameter/flavor" ]; then
-	flavor=$(cat "${__object}/parameter/flavor")
+if [ -f "$__object/parameter/flavor" ]; then
+	flavor="$(cat "$__object/parameter/flavor")"
 fi
 
-# Do not show progress bar
-pkgopts='-x'
+# do not show progress bar
+pkgopts="-x"
 
-name="${__object_id}"
-if [ -f "${__object}/parameter/name" ]; then
-	name=$(cat "${__object}/parameter/name")
-fi
-
-if [ -n "${version}" ] && [ -n "${flavor}" ]; then
-	pkgid="${name}-${version}-${flavor}"
-elif [ -n "${version}" ]; then
-	pkgid="${name}-${version}"
-elif [ -f "${__object}/parameter/flavor" ]; then
-	pkgid="${name}--${flavor}"
+if [ -f "$__object/parameter/name" ]; then
+   name=$(cat "$__object/parameter/name")
 else
-	pkgid="${name}"
+   name="$__object_id"
 fi
 
-state_should=$(cat "${__object}/parameter/state")
-
-if [ -f "${__object}/parameter/pkg_path" ]; then
-	pkg_path=$(cat "${__object}/parameter/pkg_path")
+if [ -n "$version" ] && [ -n "$flavor" ]; then
+   pkgid="$name-$version-$flavor"
+elif [ -n "$version" ]; then
+   pkgid="$name-$version"
+elif [ -n "$flavor" ]; then
+   pkgid="$name--$flavor"
+elif [ -f "$__object/parameter/flavor" ]; then
+   pkgid="$name--"
 else
-	has_installurl=$(cat "${__object}/explorer/has_installurl")
-	if [ 'yes' != "${has_installurl}" ]; then
-		# There is no default PKG_PATH, try to provide one
-		pkg_path="ftp://ftp.openbsd.org/pub/OpenBSD/${os_version}/packages/${machine}/"
-	fi
+   pkgid="$name"
 fi
 
-state_is=$(cat "${__object}/explorer/pkg_state")
-[ "${state_is}" = "${state_should}" ] && exit 0
+state_should="$(cat "$__object/parameter/state")"
 
-case "${state_should}" in
-	present)
-		if [ -n "${pkg_path}" ]; then
-			echo "export PKG_PATH='${pkg_path}'"
-		fi
+pkg_version="$(cat "$__object/explorer/pkg_version")"
 
-		# Use this because pkg_add doesn't properly handle errors
-		cat <<EOF
-status=\$(pkg_add ${pkgopts} '${pkgid}' 2>&1 || true)
+if [ -f "$__object/parameter/pkg_path" ]; then                                  
+  pkg_path="$(cat "$__object/parameter/pkg_path")"                              
+else
+  has_installurl=$(cat "${__object}/explorer/has_installurl")
+  if [ Xyes != X"${has_installurl}" ]; then
+      # there is no default PKG_PATH, try to provide one
+      pkg_path="ftp://ftp.openbsd.org/pub/OpenBSD/$os_version/packages/$machine/"
+  fi
+fi                                                                              
 
-if ! pkg_info -q -I 'inst:${pkgid}' | grep -q '^${name}-${version}.*${flavor}$' 2>/dev/null
-then
-	# We didn't find the package in the list of 'installed packages', so it failed.
-	# This is necessary because pkg_add doesn't return properly
-
-	if [ -z "\${status}" ]; then
-		status='Failed to add package, uncaught exception.'
-	fi
-	echo "Error: \${status}" >&2
-	exit 1
+if [ "$pkg_version" ]; then
+    state_is="present"
+else
+    state_is="absent"
 fi
-EOF
-		echo 'installed' >> "${__messages_out}"
-		;;
 
-	absent)
-		# Use this because pkg_delete doesn't properly handle errors
-		cat <<EOF
-status=\$(pkg_delete ${pkgopts} '${pkgid}' 2>&1 || true)
+[ "$state_is" = "$state_should" ] && exit 0
 
-if pkg_info -q -I 'inst:${pkgid}' | grep -q '^${name}-${version}.*${flavor}' 2>/dev/null
-then
-	# We found the package in the list of 'installed packages'.
-	# This would indicate that pkg_delete failed, send the output of pkg_delete
-
-	if [ -z "\${status}" ]; then
-		status='Failed to remove package, uncaught exception.'
-	fi
-	echo "Error: \${status}" >&2
-	exit 1
+case "$state_should" in
+    present)
+        # use this because pkg_add doesn't properly handle errors
+        cat << eof
+if [ X != X"${pkg_path}" ]; then
+    PKG_PATH="${pkg_path}"; export PKG_PATH
 fi
-EOF
-		echo 'removed' >> "${__messages_out}"
-		;;
-	*)
-		echo "Unknown state: ${state_should}" >&2
+status=\$(pkg_add "$pkgopts" "$pkgid" 2>&1)
+pkg_info | grep "^${name}.*${version}.*${flavor}" > /dev/null 2>&1
+
+# We didn't find the package in the list of 'installed packages', so it failed
+# This is necessary because pkg_add doesn't return properly
+if [ \$? -ne 0 ]; then
+    if [ -z "\${status}" ]; then
+      status="Failed to add package, uncaught exception."
+    fi
+    echo "Error: \$status"
+    exit 1
+fi
+eof
+    ;;
+
+    absent)
+        # use this because pkg_add doesn't properly handle errors
+        cat << eof
+status=\$(pkg_delete "$pkgopts" "$pkgid")
+pkg_info | grep "^${name}.*${version}.*${flavor}" > /dev/null 2>&1
+
+# We found the package in the list of 'installed packages'
+# This would indicate that pkg_delete failed, send the output of pkg_delete
+if [ \$? -eq 0 ]; then
+    if [ -z "\${status}" ]; then
+      status="Failed to remove package, uncaught exception."
+    fi
+    echo "Error: \$status"
+    exit 1
+fi
+eof
+   ;;
+   *)
+		echo "Unknown state: $state_should" >&2
 		exit 1
-		;;
+   ;;
 esac
diff --git a/cdist/conf/type/__package_pkgng_freebsd/explorer/pkg_version b/cdist/conf/type/__package_pkgng_freebsd/explorer/pkg_version
index 92ce0623..9ab32f2e 100755
--- a/cdist/conf/type/__package_pkgng_freebsd/explorer/pkg_version
+++ b/cdist/conf/type/__package_pkgng_freebsd/explorer/pkg_version
@@ -29,9 +29,9 @@ fi
 
 # Don't produce "no pkgs installed" output -- breaks things
 PKG_OUTPUT=$(pkg info 2>&1)
-printf "%s" "$(echo "$PKG_OUTPUT" \
+printf "%s" "$PKG_OUTPUT" \
    | awk '{print $1}' \
    | sed 's/^\(.*\)-\([^-]*\)$/name:\1 ver:\2/g' \
    | grep "name:$name ver:" \
-   | sed 's/^.*ver:\(.*\)/\1/g')"
+   | sed 's/^.*ver:\(.*\)/\1/g'
 
diff --git a/cdist/conf/type/__package_pkgng_freebsd/gencode-remote b/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
index dd36efda..b59e3648 100755
--- a/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
+++ b/cdist/conf/type/__package_pkgng_freebsd/gencode-remote
@@ -57,15 +57,12 @@ execcmd(){
    case "$1" in
       add)
          _cmd="${add_cmd} $2"
-         echo "installed" >> "$__messages_out"
          ;;
       rm)
          _cmd="${rm_cmd} $2"
-         echo "removed" >> "$__messages_out"
          ;;
       upg)
          _cmd="${upg_cmd} $2"
-         echo "installed" >> "$__messages_out"
          ;;
       *)
          printf "Error. Don't understand command: %s" "$1" >&2
@@ -98,7 +95,7 @@ if [ -n "$curr_version" ]; then  # PKG *is* installed
       if [ "$upgrade" = "true" ]; then
          execcmd "upg" "${cmd}"
       else
-         printf 'Version %s is already installed and pkg-ng cannot upgrade directly to version %s.\nTo upgrade to the latest version, use the --upgrade flag.\n' "$curr_version" "$version" >&2
+         printf "Version %s is already installed and pkg-ng can't upgrade directly to version %s.\nTo upgrade to the latest version, use the --upgrade flag.\n" "$curr_version" "$version" >&2
          exit 1
       fi
    # PKG is supposed to be installed to the latest version
diff --git a/cdist/conf/type/__package_rubygem/gencode-remote b/cdist/conf/type/__package_rubygem/gencode-remote
index abb40653..ee563ef8 100755
--- a/cdist/conf/type/__package_rubygem/gencode-remote
+++ b/cdist/conf/type/__package_rubygem/gencode-remote
@@ -40,11 +40,9 @@ fi
 case "$state_should" in
     present)
         echo "gem install '$name' --no-ri --no-rdoc"
-        echo "installed" >> "$__messages_out"
     ;;
     absent)
         echo "gem uninstall '$name'"
-        echo "removed" >> "$__messages_out"
     ;;
     *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_update_index/explorer/currage b/cdist/conf/type/__package_update_index/explorer/currage
index 3539b8e1..50474fb3 100644
--- a/cdist/conf/type/__package_update_index/explorer/currage
+++ b/cdist/conf/type/__package_update_index/explorer/currage
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 
-type="$("$__type_explorer/type")"
+type="$($__type_explorer/type)"
 
 case "$type" in
     apt)
diff --git a/cdist/conf/type/__package_update_index/explorer/type b/cdist/conf/type/__package_update_index/explorer/type
index 35254c5f..805b9f04 100644
--- a/cdist/conf/type/__package_update_index/explorer/type
+++ b/cdist/conf/type/__package_update_index/explorer/type
@@ -21,7 +21,7 @@ if [ -f "$__object/parameter/type" ]; then
     cat "$__object/parameter/type"
 else
     # By default determine package manager based on operating system
-    os="$("$__explorer/os")"
+    os="$($__explorer/os)"
     case "$os" in
         amazon|scientific|centos|fedora|redhat) echo "yum" ;;
         debian|ubuntu|devuan) echo "apt" ;;
diff --git a/cdist/conf/type/__package_update_index/gencode-remote b/cdist/conf/type/__package_update_index/gencode-remote
index 738d38eb..2cc76b81 100755
--- a/cdist/conf/type/__package_update_index/gencode-remote
+++ b/cdist/conf/type/__package_update_index/gencode-remote
@@ -28,10 +28,10 @@ if [ -f "$__object/parameter/maxage" ]; then
 fi
 
 if [ -n "$maxage" ]; then
-    if [ "$type" != "apt" ] && [ "$type" != "pacman" ]; then
+    if [ "$type" != "apt" -a "$type" != "pacman" ]; then
         echo "ERROR: \"--maxage\" only supported for \"apt\" or \"pacman\" pkg-manager." >&2
         exit 1
-    elif [ "$currage" -lt "$maxage" ]; then
+    elif [ $currage -lt $maxage ]; then
         exit 0 # no need to update
     fi
 fi
diff --git a/cdist/conf/type/__package_upgrade_all/gencode-remote b/cdist/conf/type/__package_upgrade_all/gencode-remote
index 38aa001e..0bf86c99 100755
--- a/cdist/conf/type/__package_upgrade_all/gencode-remote
+++ b/cdist/conf/type/__package_upgrade_all/gencode-remote
@@ -44,7 +44,7 @@ else
     esac
 fi
 
-aptget="DEBIAN_FRONTEND=noninteractive apt-get --quiet --yes --no-install-recommends -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\""
+aptget="DEBIAN_FRONTEND=noninteractive apt-get --quiet --yes --no-install-recommends -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"
 
 case "$type" in
     yum)
diff --git a/cdist/conf/type/__package_yum/gencode-remote b/cdist/conf/type/__package_yum/gencode-remote
index b52953f6..97265827 100755
--- a/cdist/conf/type/__package_yum/gencode-remote
+++ b/cdist/conf/type/__package_yum/gencode-remote
@@ -61,11 +61,9 @@ fi
 case "$state_should" in
     present)
         echo "yum $opts install '$install_name'"
-        echo "installed" >> "$__messages_out"
     ;;
     absent)
         echo "yum $opts remove '$name'"
-        echo "removed" >> "$__messages_out"
     ;;
     *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__package_zypper/gencode-remote b/cdist/conf/type/__package_zypper/gencode-remote
index e45dd9ff..1f15c531 100755
--- a/cdist/conf/type/__package_zypper/gencode-remote
+++ b/cdist/conf/type/__package_zypper/gencode-remote
@@ -62,17 +62,14 @@ case "$state_should" in
         if [ -z "$version_should" ]; then
             [ "$state_is" = "present" ] && exit 0 # if state is present, we dont need to do anything
             echo "zypper $globalopts install --type '$ptype' --auto-agree-with-licenses '$name' >/dev/null"
-            echo "removed" >> "$__messages_out"
         else
             [ "$state_is" = "present" ] && [ "$version_should" = "$version_is" ] && exit 0 # if state is present and version is correct, we dont need to do anything
             echo "zypper $globalopts install --oldpackage --type '$ptype' --auto-agree-with-licenses '$name' = '$version_should' >/dev/null"
-            echo "installed" >> "$__messages_out"
         fi
     ;;
     absent)
         [ "$state_is" = "absent" ] && exit 0 # if state is absent, we dont need to do anything
         echo "zypper $globalopts remove --type '$ptype' '$name' >/dev/null"
-        echo "removed" >> "$__messages_out"
     ;;
     *)
         echo "Unknown state: $state_should" >&2
diff --git a/cdist/conf/type/__pacman_conf/manifest b/cdist/conf/type/__pacman_conf/manifest
index a43f18a1..31358274 100755
--- a/cdist/conf/type/__pacman_conf/manifest
+++ b/cdist/conf/type/__pacman_conf/manifest
@@ -59,13 +59,13 @@ if [ "${file}" ]; then
 
     if [ "${state}" = "present" ]; then
 
-        require="__file/${sec_path}/plain_file_${file}" __key_value "${file}_${key}" \
+        require="__file/${sec_path}/plain_file_${file}" __key_value "${file}_${key}"\
             --file "${sec_path}/plain_file_${file}" --key "${key}" --value "${value}" --delimiter ' = '
 
         exit 0
 
     elif [ "${state}" = "absent" ]; then
-        require="__file/${sec_path}/plain_file_${file}" __key_value "${file}_${key}" \
+        require="__file/${sec_path}/plain_file_${file}" __key_value "${file}_${key}"\
                 --state absent
         exit 0
 
@@ -87,10 +87,10 @@ eof
 
     if [ "${MATCH}" -eq 1 ]; then
         if [ "${value}" = "on" ]; then
-            require="__file/${sec_path}/${section}" __line "${key}_${value}" \
+            require="__file/${sec_path}/${section}" __line "${key}_${value}"\
                 --file "${sec_path}/${section}" --line "${key}"
         elif [ "${value}" = "off" ]; then
-            require="__file/${sec_path}/${section}" __line "${key}_${value}" \
+            require="__file/${sec_path}/${section}" __line "${key}_${value}"\
                 --file "${sec_path}/${section}" --line "${key}" --state absent
         fi
         
@@ -98,7 +98,7 @@ eof
         contains_element "${key}" "${allowed_option_keys}"
 
         if [ "${MATCH}" -eq 1 ]; then
-            require="__file/${sec_path}/${section}" __key_value "${section}_${key}" \
+            require="__file/${sec_path}/${section}" __key_value "${section}_${key}"\
                     --file "${sec_path}/${section}" --key "${key}" --value "${value}" --delimiter ' = '
         else
             echo "Key: ${key} is not valid. Have a look at man pacman.conf" >&2
@@ -118,12 +118,12 @@ eof
             exit
         fi
     
-        require="__file/${sec_path}/repo_${section}" __key_value "${section}_${key}" \
+        require="__file/${sec_path}/repo_${section}" __key_value "${section}_${key}"\
                 --file "${sec_path}/repo_${section}" --key "${key}" --value "${value}" --delimiter ' = '
 
     elif [ "${state}" = "absent" ]; then
 
-        require="__file/${sec_path}/repo_${section}" __key_value "${section}_${key}" \
+        require="__file/${sec_path}/repo_${section}" __key_value "${section}_${key}"\
             --state absent
 
     else
diff --git a/cdist/conf/type/__pacman_conf_integrate/manifest b/cdist/conf/type/__pacman_conf_integrate/manifest
index 0ce0bee5..cc081eed 100755
--- a/cdist/conf/type/__pacman_conf_integrate/manifest
+++ b/cdist/conf/type/__pacman_conf_integrate/manifest
@@ -18,7 +18,9 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-state=$(cat "$__object/parameter/state" 2>/dev/null)
+state="$(cat "$__object/parameter/state" 2>/dev/null)"
+
+# path="/etc/"
 
 if [ "${state}" = "present" ]; then
     __file /etc/pacman.conf\
diff --git a/cdist/conf/type/__pf_ruleset/gencode-local b/cdist/conf/type/__pf_ruleset/gencode-local
index 11bfb0b1..b9de1bce 100755
--- a/cdist/conf/type/__pf_ruleset/gencode-local
+++ b/cdist/conf/type/__pf_ruleset/gencode-local
@@ -69,10 +69,10 @@ fi
 
 if [ -n "${cksum}" ]; then
    if [ ! "\${currentSum}" = "${cksum}" ]; then
-      $__remote_copy "${source}" "\${my_target_host}:${rcvar}.new"
+      $__remote_copy "${source}" "${my_target_host}:${rcvar}.new"
    fi
 else # File just doesn't exist yet
-   $__remote_copy "${source}" "\${my_target_host}:${rcvar}.new"
+   $__remote_copy "${source}" "${my_target_host}:${rcvar}.new"
 fi
 EOF
 
diff --git a/cdist/conf/type/__ping/gencode-remote b/cdist/conf/type/__ping/gencode-remote
deleted file mode 100644
index 1341b954..00000000
--- a/cdist/conf/type/__ping/gencode-remote
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (C) 2018 Olliver Schinagl <oliver@schinagl.nl>
-#
-# SPDX-License-Identifier: GPL-3.0+
-#
-
-set -eu
-
-echo "echo 'pong'"
-
-exit 0
diff --git a/cdist/conf/type/__ping/man.rst b/cdist/conf/type/__ping/man.rst
deleted file mode 100644
index e08643dc..00000000
--- a/cdist/conf/type/__ping/man.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-cdist-type__ping(7)
-==================================
-
-NAME
-----
-cdist-type__ping - Try to connect to host and return 'pong' on success
-
-
-DESCRIPTION
------------
-A simple type which tries to connect to a remote host and runs a simple command
-to ensure everything is working.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    __ping
-
-
-AUTHORS
--------
-Olliver Schinagl <oliver--@--schinagl.nl>
-
-
-COPYING
--------
-Copyright \(C) 2018 Schinagl. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__ping/singleton b/cdist/conf/type/__ping/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__postfix/manifest b/cdist/conf/type/__postfix/manifest
index f3616979..1aea53a1 100755
--- a/cdist/conf/type/__postfix/manifest
+++ b/cdist/conf/type/__postfix/manifest
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # 2012-2014 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -23,7 +22,7 @@
 os=$(cat "$__global/explorer/os")
 
 case "$os" in
-   alpine|ubuntu|debian|archlinux|suse|scientific|centos|devuan)
+   ubuntu|debian|archlinux|suse|scientific|centos|devuan)
       __package postfix --state present
    ;;
    *)
diff --git a/cdist/conf/type/__postfix_master/manifest b/cdist/conf/type/__postfix_master/manifest
index 0960ea41..058dc6ba 100755
--- a/cdist/conf/type/__postfix_master/manifest
+++ b/cdist/conf/type/__postfix_master/manifest
@@ -36,6 +36,7 @@ __postfix
 
 # Default to object_id
 service="$(cat "$__object/parameter/service" 2>/dev/null || echo "$__object_id")"
+# state="$(cat "$__object/parameter/state")"
 
 # NOTE: keep variables in sync in manifest,explorer,gencode-*
 prefix="#cdist:$__object_name"
@@ -50,6 +51,7 @@ entry="$__object/files/entry"
       echo "# $(cat "$__object/parameter/comment")"
    fi
    printf "%s " "$service"
+   printf "%s " "$type"
    for parameter in type private unpriv chroot wakeup maxproc; do
       printf "%s " "$(cat "$__object/parameter/$parameter")"
    done
diff --git a/cdist/conf/type/__postfix_postconf/explorer/value b/cdist/conf/type/__postfix_postconf/explorer/value
index 67dacad8..17126c94 100755
--- a/cdist/conf/type/__postfix_postconf/explorer/value
+++ b/cdist/conf/type/__postfix_postconf/explorer/value
@@ -22,7 +22,7 @@
 os=$("$__explorer/os")
 
 case "$os" in
-   alpine|ubuntu|debian|archlinux|suse|scientific|centos|devuan)
+   ubuntu|debian|archlinux|suse|scientific|centos|devuan)
       :
    ;;
    *)
diff --git a/cdist/conf/type/__postfix_postconf/gencode-remote b/cdist/conf/type/__postfix_postconf/gencode-remote
index 279dddd4..6df0da7f 100755
--- a/cdist/conf/type/__postfix_postconf/gencode-remote
+++ b/cdist/conf/type/__postfix_postconf/gencode-remote
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # 2012-2014 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -22,7 +21,7 @@
 os=$(cat "$__global/explorer/os")
 
 case "$os" in
-   alpine|archlinux|centos|debian|devuan|suse|scientific|ubuntu)
+   ubuntu|debian|archlinux|suse|scientific|centos|devuan)
       :
    ;;
    *)
diff --git a/cdist/conf/type/__postgres_database/explorer/state b/cdist/conf/type/__postgres_database/explorer/state
index d68d4120..7a7c40a3 100755
--- a/cdist/conf/type/__postgres_database/explorer/state
+++ b/cdist/conf/type/__postgres_database/explorer/state
@@ -18,25 +18,10 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-case "$("${__explorer}/os")"
-in
-    netbsd)
-        postgres_user='pgsql'
-        ;;
-    openbsd)
-        postgres_user='_postgresql'
-        ;;
-    *)
-        postgres_user='postgres'
-        ;;
-esac
-
-
 name="$__object_id"
 
-if test -n "$(su - "$postgres_user" -c "psql postgres -twAc \"SELECT 1 FROM pg_database WHERE datname='$name'\"")"
-then
-    echo 'present'
+if su -l postgres -c "echo '\q' | psql '$name'" 2>/dev/null; then
+   echo "present"
 else
-    echo 'absent'
+   echo "absent"
 fi
diff --git a/cdist/conf/type/__postgres_database/gencode-remote b/cdist/conf/type/__postgres_database/gencode-remote
index 61cfa50d..32fe08cf 100755
--- a/cdist/conf/type/__postgres_database/gencode-remote
+++ b/cdist/conf/type/__postgres_database/gencode-remote
@@ -18,20 +18,6 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-case "$(cat "${__global}/explorer/os")"
-in
-   netbsd)
-      postgres_user='pgsql'
-      ;;
-   openbsd)
-      postgres_user='_postgresql'
-      ;;
-   *)
-      postgres_user='postgres'
-      ;;
-esac
-
-
 name="$__object_id"
 state_should="$(cat "$__object/parameter/state")"
 state_is="$(cat "$__object/explorer/state")"
@@ -43,10 +29,10 @@ if [ "$state_should" != "$state_is" ]; then
          if [ -f "$__object/parameter/owner" ]; then
             owner="-O '$(cat "$__object/parameter/owner")'"
          fi
-         echo "su - '$postgres_user' -c \"createdb $owner '$name'\""
+         echo "su -l postgres -c \"createdb $owner '$name'\""
       ;;
       absent)
-         echo "su - '$postgres_user' -c \"dropdb '$name'\""
+         echo "su -l postgres -c \"dropdb '$name'\""
       ;;
    esac
 fi
diff --git a/cdist/conf/type/__postgres_extension/gencode-remote b/cdist/conf/type/__postgres_extension/gencode-remote
index af9c97f1..60072994 100755
--- a/cdist/conf/type/__postgres_extension/gencode-remote
+++ b/cdist/conf/type/__postgres_extension/gencode-remote
@@ -22,20 +22,6 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-case "$(cat "${__global}/explorer/os")"
-in
-   netbsd)
-      postgres_user='pgsql'
-      ;;
-   openbsd)
-      postgres_user='_postgresql'
-      ;;
-   *)
-      postgres_user='postgres'
-      ;;
-esac
-
-
 dbname=$(    echo "$__object_id" | cut -d":" -f1 )
 extension=$( echo "$__object_id" | cut -d":" -f2 )
 
@@ -44,10 +30,10 @@ state_should=$( cat "$__object/parameter/state" )
 case "$state_should" in
     present)
          cmd="CREATE EXTENSION IF NOT EXISTS $extension"
-         echo "su - '$postgres_user' -c 'psql -c \"$cmd\" \"$dbname\"'"
+         echo "su -l postgres -c 'psql -c \"$cmd\" \"$dbname\"'"
     ;;
     absent)
-         cmd="DROP EXTENSION IF EXISTS $extension"
-         echo "su - '$postgres_user' -c 'psql -c \"$cmd\" \"$dbname\"'"
+         cmd="DROP   EXTENSION IF     EXISTS $extenstion"
+         echo "su -l postgres -c 'psql -c \"$cmd\" \"$dbname\"'"
     ;;
 esac
diff --git a/cdist/conf/type/__postgres_role/explorer/state b/cdist/conf/type/__postgres_role/explorer/state
index c8e1fa9d..6f7e2955 100755
--- a/cdist/conf/type/__postgres_role/explorer/state
+++ b/cdist/conf/type/__postgres_role/explorer/state
@@ -18,25 +18,10 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-case "$("${__explorer}/os")"
-in
-    netbsd)
-        postgres_user='pgsql'
-        ;;
-    openbsd)
-        postgres_user='_postgresql'
-        ;;
-    *)
-        postgres_user='postgres'
-        ;;
-esac
-
-
 name="$__object_id"
 
-if test -n "$(su - "$postgres_user" -c "psql postgres -twAc \"SELECT 1 FROM pg_roles WHERE rolname='$name'\"")"
-then
-    echo 'present'
+if su -l postgres -c "psql -c '\du' | grep -q '^ *$name *|'"; then
+   echo "present"
 else
-    echo 'absent'
+   echo "absent"
 fi
diff --git a/cdist/conf/type/__postgres_role/gencode-remote b/cdist/conf/type/__postgres_role/gencode-remote
index fd56e85d..901390e9 100755
--- a/cdist/conf/type/__postgres_role/gencode-remote
+++ b/cdist/conf/type/__postgres_role/gencode-remote
@@ -18,20 +18,6 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-case "$(cat "${__global}/explorer/os")"
-in
-    netbsd)
-        postgres_user='pgsql'
-        ;;
-    openbsd)
-        postgres_user='_postgresql'
-        ;;
-    *)
-        postgres_user='postgres'
-        ;;
-esac
-
-
 name="$__object_id"
 state_is="$(cat "$__object/explorer/state")"
 state_should="$(cat "$__object/parameter/state")"
@@ -52,12 +38,12 @@ case "$state_should" in
             booleans="$booleans $upper"
         done
 
-        [ -n "$password" ] && password="PASSWORD '$password'"
+         [ -n "$password" ] && password="PASSWORD '$password'"
 
-        cmd="CREATE ROLE $name WITH $password $booleans"
-        echo "su - '$postgres_user' -c \"psql postgres -wc \\\"$cmd\\\"\""
+         cmd="CREATE ROLE $name WITH $password $booleans"
+         echo "su -l postgres -c \"psql -c \\\"$cmd\\\"\""
     ;;
     absent)
-        echo "su - '$postgres_user' -c \"dropuser \\\"$name\\\"\""
+        echo "su -l postgres -c \"dropuser \\\"$name\\\"\""
     ;;
 esac
diff --git a/cdist/conf/type/__process/gencode-remote b/cdist/conf/type/__process/gencode-remote
index ec9691b9..fc491321 100755
--- a/cdist/conf/type/__process/gencode-remote
+++ b/cdist/conf/type/__process/gencode-remote
@@ -52,7 +52,7 @@ case "$state_should" in
         if [ -f "$__object/parameter/stop" ]; then
             cat "$__object/parameter/stop"
         else
-            echo kill "$(cat "$__object/parameter/runs")"
+            echo kill "${runs}"
         fi
         echo "stopped" >> "$__messages_out"
     ;;
diff --git a/cdist/conf/type/__prometheus_alertmanager/manifest b/cdist/conf/type/__prometheus_alertmanager/manifest
index 8ee818c3..be50b71e 100755
--- a/cdist/conf/type/__prometheus_alertmanager/manifest
+++ b/cdist/conf/type/__prometheus_alertmanager/manifest
@@ -15,7 +15,6 @@ storage_path="$(cat "$__object/parameter/storage-path")"
 ##### INSTALL THE PACKAGE ###################################################
 
 require_pkg=""  # what to require if I want to require "the package"
-require=""
 if [ -f "$__object/parameter/install-from-backports" ]; then
 	os=$(cat "$__global/explorer/os")
 	os_version=$(cat "$__global/explorer/os_version")
@@ -49,7 +48,7 @@ __key_value alertmanager_fix_init_script --file /etc/init.d/prometheus-alertmana
 
 ##### CONFIGURE #############################################################
 
-FLAGS="--storage.path $storage_path --data.retention $((retention_days*24))h --web.listen-address [::]:9093 --cluster.advertise-address [::]:9093"
+FLAGS="--storage.path $storage_path --data.retention $(($retention_days*24))h --web.listen-address [::]:9093"
 
 require="$require $require_pkg" \
 __key_value alertmanager_args --file /etc/default/prometheus-alertmanager \
@@ -58,7 +57,7 @@ __key_value alertmanager_args --file /etc/default/prometheus-alertmanager \
 
 require="$require __directory/$storage_path $require_pkg" \
 __config_file $CONF \
-	--source "$config" \
+	--source $config \
 	--group prometheus --mode 640 \
 	--onchange "service prometheus-alertmanager reload"  # TODO when a config-check tool is available, check config here
 
diff --git a/cdist/conf/type/__prometheus_exporter/manifest b/cdist/conf/type/__prometheus_exporter/manifest
index b9e14531..35e654e2 100644
--- a/cdist/conf/type/__prometheus_exporter/manifest
+++ b/cdist/conf/type/__prometheus_exporter/manifest
@@ -7,7 +7,6 @@ exporter="$(cat "$__object/parameter/exporter")"
 
 __user prometheus --system
 
-require=""
 case $exporter in
 	node)
 		TEXTFILES=/service/node-exporter/textfiles  # path for the textfiles collector
diff --git a/cdist/conf/type/__prometheus_server/manifest b/cdist/conf/type/__prometheus_server/manifest
index 8685130f..2bdcb43e 100755
--- a/cdist/conf/type/__prometheus_server/manifest
+++ b/cdist/conf/type/__prometheus_server/manifest
@@ -13,12 +13,11 @@ storage_path="$(cat "$__object/parameter/storage-path")"
 rule_files="$(cat "$__object/parameter/rule-files")"
 
 # explorer in kB => convert; by default we go with 1/2 RAM
-[ "$target_heap_size" = "auto" ] && target_heap_size=$(($(cat "$__global/explorer/memory")*1024/2))
+[ "$target_heap_size" = "auto" ] && target_heap_size=$(( "$(cat "$__global/explorer/memory")" * 1024 / 2 ))
 
 ##### INSTALL THE PACKAGE ###################################################
 
 require_pkg=""  # what to require if I want to require "the package"
-require=""
 if [ -f "$__object/parameter/install-from-backports" ]; then
 	os=$(cat "$__global/explorer/os")
 	os_version=$(cat "$__global/explorer/os_version")
@@ -46,7 +45,7 @@ require="$require $require_pkg" __directory "$storage_path" --owner prometheus -
 
 ##### CONFIGURE #############################################################
 
-FLAGS="--storage.tsdb.path $storage_path --storage.tsdb.retention $((retention_days*24))h --web.listen-address [::]:9090"
+FLAGS="--storage.tsdb.path $storage_path --storage.tsdb.retention $(($retention_days*24))h --web.listen-address [::]:9090"
 
 # TODO it would be neat to restart prometheus on change -- __key_value really should have an --onchange parameter
 require="$require $require_pkg" \
@@ -61,7 +60,7 @@ __config_file $CONF \
 	--onchange "promtool check config $CONF && service prometheus reload"
 
 for file in $rule_files; do
-	dest=$CONF_DIR/$(basename "$file")
+	dest=$CONF_DIR/$(basename $file)
 	require="$require $require_pkg" \
 	__config_file "$dest" \
 		--source "$file" \
diff --git a/cdist/conf/type/__pyvenv/gencode-remote b/cdist/conf/type/__pyvenv/gencode-remote
index 04700683..0f8b2822 100755
--- a/cdist/conf/type/__pyvenv/gencode-remote
+++ b/cdist/conf/type/__pyvenv/gencode-remote
@@ -30,9 +30,9 @@ group="$(cat "$__object/parameter/group")"
 mode="$(cat "$__object/parameter/mode")"
 
 [  "$state_should" = "$state_is" ] && \
-[  "$owner" = "$owner_is" ] && \
-[  "$group" = "$group_is" ] && \
-[  -n "$mode" ] && exit 0
+   [ "$owner" = "$owner_is" ] && \
+   [ "$group" = "$group_is" ] && \
+   [ -n "$mode" ] && exit 0
 
 destination="/$__object_id"
 venvparams="$(cat "$__object/parameter/venvparams")"
@@ -47,10 +47,10 @@ fi
 case $state_should in
     present)
         if [ "$state_should" != "$state_is" ]; then
-            echo "$pyvenv $venvparams $destination"
+            echo "$pyvenv" "$venvparams" "$destination"
         fi
-        if { [ -n "$owner" ] && [ "$owner_is" != "$owner" ]; } || \
-           { [ -n "$group" ] && [ "$group_is" != "$group" ]; }; then
+        if ([ -n "$owner" ] && [ "$owner_is" != "$owner" ]) || \
+             ([ -n "$group" ] && [ "$group_is" != "$group" ]); then
             echo chown -R "${owner}:${group}" "$destination"
         fi
         if [ -n "$mode" ]; then
diff --git a/cdist/conf/type/__qemu_img/manifest b/cdist/conf/type/__qemu_img/manifest
index 55f3bf16..7cf21238 100755
--- a/cdist/conf/type/__qemu_img/manifest
+++ b/cdist/conf/type/__qemu_img/manifest
@@ -4,6 +4,7 @@
 # Default settings
 #
 
+# format="$(cat "$__object/parameter/format")"
 state_should="$(cat "$__object/parameter/state")"
 
 diskimage="/$__object_id"
diff --git a/cdist/conf/type/__rvm/explorer/state b/cdist/conf/type/__rvm/explorer/state
index 74d17048..67e1c27c 100755
--- a/cdist/conf/type/__rvm/explorer/state
+++ b/cdist/conf/type/__rvm/explorer/state
@@ -28,7 +28,7 @@ if [ "$user" = "root" ]; then
         echo absent
     fi
 else
-    if su - "$user" -c "[ -d \"\$HOME/.rvm\" ]" ; then
+    if su -l "$user" -c "[ -d \"\$HOME/.rvm\" ]" ; then
        echo "present"
     else
        echo "absent"
diff --git a/cdist/conf/type/__rvm/gencode-remote b/cdist/conf/type/__rvm/gencode-remote
index 993191c1..3016e648 100755
--- a/cdist/conf/type/__rvm/gencode-remote
+++ b/cdist/conf/type/__rvm/gencode-remote
@@ -28,13 +28,13 @@ state_should="$(cat "$__object/parameter/state")"
 case "$state_should" in
     present)
         cat << DONE
-su - $user -c "unset rvm_path; unset rvm_bin_path; unset rvm_prefix; unset rvm_version; curl -L get.rvm.io | bash -s stable"
+su -l $user -c "unset rvm_path; unset rvm_bin_path; unset rvm_prefix; unset rvm_version; curl -L get.rvm.io | bash -s stable"
 DONE
     ;;
     absent)
         cat << DONE
-su - $user -c "rm -Rf \"\\\$HOME/.rvm\";
-sed '/rvm\\/scripts\\/rvm/d' \"\\\$HOME/.bashrc\" > \"\\\$HOME/.bashrc.cdist-tmp\"
+su -l $user -c "rm -Rf \"\\\$HOME/.rvm\";
+sed '/rvm\/scripts\/rvm/d' \"\\\$HOME/.bashrc\" > \"\\\$HOME/.bashrc.cdist-tmp\"
 mv \"\\\$HOME/.bashrc.cdist-tmp\" \"\\\$HOME/.bashrc\""
 DONE
     ;;
diff --git a/cdist/conf/type/__rvm_gem/explorer/state b/cdist/conf/type/__rvm_gem/explorer/state
index 4146d666..b0b40a0a 100755
--- a/cdist/conf/type/__rvm_gem/explorer/state
+++ b/cdist/conf/type/__rvm_gem/explorer/state
@@ -24,13 +24,13 @@ gemset="$(cat "$__object/parameter/gemset")"
 ruby="$(echo "$gemset" | cut -d '@' -f 1)"
 gemsetname="$(echo "$gemset" | cut -d '@' -f2)"
 user="$(cat "$__object/parameter/user")"
-if su - "$user" -c "[ ! -d \"\$HOME/.rvm\" ]" ; then
+if su -l "$user" -c "[ ! -d \"\$HOME/.rvm\" ]" ; then
    echo "absent"
    exit 0
 fi
-if su - "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
+if su -l "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
 rvm list | grep -q $ruby"; then
-   if su - "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
+   if su -l "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
 rvm use $ruby > /dev/null 2>&1; rvm gemset list | grep -q $gemsetname &&
 rvm use $gemset > /dev/null 2>&1 && gem list | grep -q $gem"; then
       echo "present"
diff --git a/cdist/conf/type/__rvm_gem/gencode-remote b/cdist/conf/type/__rvm_gem/gencode-remote
index 9212de91..ace05df6 100755
--- a/cdist/conf/type/__rvm_gem/gencode-remote
+++ b/cdist/conf/type/__rvm_gem/gencode-remote
@@ -29,12 +29,12 @@ state_should="$(cat "$__object/parameter/state")"
 case "$state_should" in
     present)
         cat << DONE
-su - "$user" -c 'source ~/.rvm/scripts/rvm; rvm use "$gemset"; gem install "$gem"'
+su -l "$user" -c 'source ~/.rvm/scripts/rvm; rvm use "$gemset"; gem install "$gem"'
 DONE
     ;;
     absent)
         cat << DONE
-su - "$user" -c 'source ~/.rvm/scripts/rvm; rvm use "$gemset"; gem uninstall "$gem"'
+su -l "$user" -c 'source ~/.rvm/scripts/rvm; rvm use "$gemset"; gem uninstall "$gem"'
 DONE
     ;;
 esac
diff --git a/cdist/conf/type/__rvm_gemset/explorer/state b/cdist/conf/type/__rvm_gemset/explorer/state
index e300453b..1b4738b6 100755
--- a/cdist/conf/type/__rvm_gemset/explorer/state
+++ b/cdist/conf/type/__rvm_gemset/explorer/state
@@ -18,6 +18,9 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
+gemset="$__object_id"
+ruby="$(echo "$gemset" | cut -d '@' -f 1)"
+gemsetname="$(echo "$gemset" | cut -d '@' -f2)"
 user="$(cat "$__object/parameter/user")"
 
 if [ ! -e "~$user/.rvm/scripts/rvm" ] ; then
@@ -25,10 +28,8 @@ if [ ! -e "~$user/.rvm/scripts/rvm" ] ; then
    exit 0
 fi
 
-# shellcheck disable=SC2016
-if su - "$user" -c 'source ~/.rvm/scripts/rvm; rvm list strings | grep -q "^$ruby\$"'; then
-    # shellcheck disable=SC2016
-    if su - "$user" -c 'source ~/.rvm/scripts/rvm; rvm use "$ruby" > /dev/null; rvm gemset list strings | cut -f 1 -d " " | grep -q "^$gemsetname\$"'; then
+if su -l "$user" -c "source ~/.rvm/scripts/rvm; rvm list strings | grep -q \"^$ruby\$\""; then
+    if su -l "$user" -c "source ~/.rvm/scripts/rvm; rvm use \"$ruby\" > /dev/null; rvm gemset list strings | cut -f 1 -d " " | grep -q \"^$gemsetname\$\""; then
       echo "present"
       exit 0
   fi
diff --git a/cdist/conf/type/__rvm_gemset/gencode-remote b/cdist/conf/type/__rvm_gemset/gencode-remote
index 3cdc66a6..a902b9fb 100755
--- a/cdist/conf/type/__rvm_gemset/gencode-remote
+++ b/cdist/conf/type/__rvm_gemset/gencode-remote
@@ -31,18 +31,18 @@ state_should="$(cat "$__object/parameter/state")"
 case "$state_should" in
     present)
         cat << DONE
-su - "$user" -c "source ~/.rvm/scripts/rvm; rvm $gemset --create"
+su -l "$user" -c "source ~/.rvm/scripts/rvm; rvm $gemset --create"
 DONE
-        if [ -f "$__object/parameter/default" ]; then
+        if -f "$__object/parameter/default"; then
             cat << DONE
-su - "$user" -c "source ~/.rvm/scripts/rvm; rvm use --default $gemset"
+su -l "$user" -c "source ~/.rvm/scripts/rvm; rvm use --default $gemset"
 DONE
         fi
 
     ;;
     absent)
         cat << DONE
-su - "$user" -c "source ~/.rvm/scripts/rvm; rvm use $ruby; rvm --force gemset delete $gemsetname"
+su -l "$user" -c "source ~/.rvm/scripts/rvm; rvm use $ruby; rvm --force gemset delete $gemsetname"
 DONE
     ;;
 esac
diff --git a/cdist/conf/type/__rvm_ruby/explorer/state b/cdist/conf/type/__rvm_ruby/explorer/state
index 43dafd4f..7ee8863a 100755
--- a/cdist/conf/type/__rvm_ruby/explorer/state
+++ b/cdist/conf/type/__rvm_ruby/explorer/state
@@ -20,11 +20,11 @@
 
 ruby="$__object_id"
 user="$(cat "$__object/parameter/user")"
-if su - "$user" -c "[ ! -d \"\$HOME/.rvm\" ]" ; then
+if su -l "$user" -c "[ ! -d \"\$HOME/.rvm\" ]" ; then
     echo "absent"
     exit 0
 fi
-if su - "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
+if su -l "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
 rvm list | grep -q $ruby"; then
    echo "present"
 else
diff --git a/cdist/conf/type/__rvm_ruby/gencode-remote b/cdist/conf/type/__rvm_ruby/gencode-remote
index f2fd41ef..012c84c2 100755
--- a/cdist/conf/type/__rvm_ruby/gencode-remote
+++ b/cdist/conf/type/__rvm_ruby/gencode-remote
@@ -27,15 +27,15 @@ state_should="$(cat "$__object/parameter/state")"
 
 case "$state_should" in
     present)
-        echo "su - \"$user\" -c \"source \\\$HOME/.rvm/scripts/rvm;"\
+        echo "su -l \"$user\" -c \"source \\\$HOME/.rvm/scripts/rvm;"\
             "rvm install $ruby\""
         if [ -f "$__object/parameter/default" ]; then
-            echo "su - \"$user\" -c \"source \\\$HOME/.rvm/scripts/rvm;"\
+            echo "su -l \"$user\" -c \"source \\\$HOME/.rvm/scripts/rvm;"\
                 "rvm use --default $ruby\""
         fi
     ;;
     absent)
-        echo "su - \"$user\" -c \"source \\\$HOME/.rvm/scripts/rvm;"\
+        echo "su -l \"$user\" -c \"source \\\$HOME/.rvm/scripts/rvm;"\
             "rvm remove $ruby\""
     ;;
 
diff --git a/cdist/conf/type/__ssh_authorized_key/explorer/entry b/cdist/conf/type/__ssh_authorized_key/explorer/entry
index ccab0afc..a6b849ce 100755
--- a/cdist/conf/type/__ssh_authorized_key/explorer/entry
+++ b/cdist/conf/type/__ssh_authorized_key/explorer/entry
@@ -19,7 +19,7 @@
 #
 
 # extract the keytype and base64 encoded key ignoring any options and comment
-type_and_key="$(tr ' ' '\n' < "$__object/parameter/key"| awk '/^(ssh|ecdsa)-[^ ]+/ { printf $1" "; getline; printf $1 }')"
+type_and_key="$(tr ' ' '\n' < "$__object/parameter/key" | awk '/^(ssh|ecdsa)-[^ ]+/ { printf $1" "; getline; printf $1 }')"
 # If type_and_key is empty, which is the case with an invalid key, do not grep $file because it results
 # in greping everything in file and all entries from file are removed.
 if [ -n "${type_and_key}" ]
@@ -27,8 +27,5 @@ then
     file="$(cat "$__object/parameter/file")"
 
     # get any entries that match the type and key
-
-    # NOTE: Do not match from the beginning of the line as there may be options
-    # preceeding the key.
-    grep "${type_and_key}\\([ \\n].*\\)*$" "$file" || true
+    grep ".*$type_and_key\([ \n]\|$\)" "$file" || true
 fi
diff --git a/cdist/conf/type/__ssh_authorized_key/gencode-remote b/cdist/conf/type/__ssh_authorized_key/gencode-remote
index f37aa565..e1273028 100755
--- a/cdist/conf/type/__ssh_authorized_key/gencode-remote
+++ b/cdist/conf/type/__ssh_authorized_key/gencode-remote
@@ -25,7 +25,7 @@ the_key="$(cat "$__object/parameter/key")"
 validated_key="$(echo "${the_key}" | tr ' ' '\n' | awk '/^(ssh|ecdsa)-[^ ]+/ { printf $1" "; getline; printf $1 }')"
 if [ -z "${validated_key}" ]
 then
-    echo "Key is invalid: \"${the_key}\"" >&2
+    echo "Key is invalid: '${the_key}'" >&2
     exit 1
 fi
 
@@ -48,7 +48,7 @@ add_line() {
    line="$2"
    # escape single quotes
    line_sanitised=$(echo "$line" | sed -e "s/'/'\"'\"'/g")
-   printf '%s' "printf '%s\\n' '$line_sanitised' >> $file"
+   printf '%s' "printf '%s\n' '$line_sanitised' >> $file"
 }
 
 
diff --git a/cdist/conf/type/__ssh_authorized_keys/manifest b/cdist/conf/type/__ssh_authorized_keys/manifest
index b507c7ff..f6ff74c3 100755
--- a/cdist/conf/type/__ssh_authorized_keys/manifest
+++ b/cdist/conf/type/__ssh_authorized_keys/manifest
@@ -45,6 +45,18 @@ if [ ! -f "$__object/parameter/noparent" ] || [ ! -f "$__object/parameter/nofile
    fi
 fi
 
+# Remove legacy blocks created by old versions of this type
+# FIXME: remove me in 3.2+
+__block "$__object_name" \
+   --file "$file" \
+   --prefix "#cdist:$__object_name" \
+   --suffix "#/cdist:$__object_name" \
+   --state 'absent' \
+   --text - << DONE
+remove legacy block
+DONE
+export require="__block/$__object_name"
+
 _cksum() {
    echo "$1" | cksum | cut -d' ' -f 1
 }
@@ -57,8 +69,7 @@ while read -r key; do
    set -- "$@" --key "$key"
    set -- "$@" --state "$state"
    if [ -f "$__object/parameter/option" ]; then
-      # shellcheck disable=SC2046
-      set -- "$@" $(printf -- '--option %s ' $(cat "$__object/parameter/option"))
+      set -- "$@" --option "$(cat "$__object/parameter/option")"
    fi
    if [ -f "$__object/parameter/comment" ]; then
       set -- "$@" --comment "$(cat "$__object/parameter/comment")"
diff --git a/cdist/conf/type/__staged_file/gencode-local b/cdist/conf/type/__staged_file/gencode-local
index ba9e8798..b953c40a 100755
--- a/cdist/conf/type/__staged_file/gencode-local
+++ b/cdist/conf/type/__staged_file/gencode-local
@@ -56,23 +56,17 @@ get_file() {
 }
 
 fetch_file() {
-   # shellcheck disable=SC2059
    printf "$fetch_command" "$source"
    printf ' > "%s"\n' "$stage_file"
 }
 
 fetch_and_prepare_file() {
-   # shellcheck disable=SC2016
-   printf 'tmpdir="$(mktemp -d -p "/tmp" "%s")"\n' "${__type##*/}.XXXXXXXXXX"
-   # shellcheck disable=SC2016
+   printf 'tmpdir="$(TMPDIR=${TMPDIR:-/tmp} mktemp -d "%s")"\n' "${__type##*/}.XXXXXXXXXX"
    printf 'cd "$tmpdir"\n'
-   # shellcheck disable=SC2059
-   printf "$fetch_command > \"%s\"\\n" "$source" "$source_file_name"
+   printf "$fetch_command > \"%s\"\n" "$source" "$source_file_name"
    prepare_command="$(cat "$__object/parameter/prepare-command")"
-   # shellcheck disable=SC2059
-   printf "$prepare_command > \"%s\"\\n" "$source_file_name" "$stage_file"
+   printf "$prepare_command > \"%s\"\n" "$source_file_name" "$stage_file"
    printf 'cd - >/dev/null\n'
-   # shellcheck disable=SC2016
    printf 'rm -rf "$tmpdir"\n'
 }
 
diff --git a/cdist/conf/type/__staged_file/manifest b/cdist/conf/type/__staged_file/manifest
index c8e1fbbb..4d843275 100755
--- a/cdist/conf/type/__staged_file/manifest
+++ b/cdist/conf/type/__staged_file/manifest
@@ -19,7 +19,11 @@
 #
 
 destination="$__object_id"
+# source="$(cat "$__object/parameter/source")"
+# cksum="$(cat "$__object/parameter/cksum")"
 stage_dir="$(cat "$__object/parameter/stage-dir")"
+# state="$(cat "$__object/parameter/state")"
+# fetch_command="$(cat "$__object/parameter/fetch-command")"
 stage_file="${stage_dir}/${destination}"
 
 set -- "/${destination}"
diff --git a/cdist/conf/type/__start_on_boot/explorer/state b/cdist/conf/type/__start_on_boot/explorer/state
index b7a6cf0f..d8f9b7ba 100644
--- a/cdist/conf/type/__start_on_boot/explorer/state
+++ b/cdist/conf/type/__start_on_boot/explorer/state
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2012-2019 Nico Schottelius (nico-cdist at schottelius.org)
+# 2012-2015 Nico Schottelius (nico-cdist at schottelius.org)
 # 2013 Daniel Heule (hda at sfs.biz)
 #
 # This file is part of cdist.
@@ -38,27 +38,12 @@ if [ "$init" = 'systemd' ]; then
 else
     case "$os" in
         debian|openwrt|devuan)
-            state="absent"
-            for file in "/etc/rc$runlevel.d/S"??"$name"
-            do
-                if [ -f "$file" ]
-                then
-                    state="present"
-                    break
-                fi
-            done
+            state="present"
+            [ -f "/etc/rc$runlevel.d/S"??"$name" ] || state="absent"
         ;;
         ubuntu)
             state="absent"
-            for file in "/etc/rc$runlevel.d/S"??"$name"
-            do
-                if [ -f "$file" ]
-                then
-                    state="present"
-                    break
-                fi
-            done
-
+            [ -f "/etc/rc$runlevel.d/S"??"$name" ] && state="present"
             [ -f "/etc/init/${name}.conf" ] && state="present"
         ;;
 
@@ -75,25 +60,14 @@ else
             state=$(chkconfig --check "$name" "$runlevel" || echo absent)
             [ "$state" ] || state="present"
         ;;
-        gentoo|alpine)
-            state="absent"
-            for d in /etc/runlevels/*; do
-                if [ -f "/etc/runlevels/${d}/${name}" ];then
-                    state="present"
-                    break
-                fi
-            done
+        gentoo)
+            state="present"
+            [ -f "/etc/runlevels/${target_runlevel}/${name}" ] || state="absent"
         ;;
         freebsd)
             state="absent"
             service -e | grep "/$name$" && state="present"
         ;;
-        openbsd)
-            state='absent'
-            # OpenBSD 5.7 and higher
-            rcctl ls on | grep "^${name}$" && state='present'
-        ;;
-
         *)
            echo "Unsupported os: $os" >&2
            exit 1
diff --git a/cdist/conf/type/__start_on_boot/gencode-remote b/cdist/conf/type/__start_on_boot/gencode-remote
index c900933f..bd343c9a 100755
--- a/cdist/conf/type/__start_on_boot/gencode-remote
+++ b/cdist/conf/type/__start_on_boot/gencode-remote
@@ -58,7 +58,7 @@ case "$state_should" in
                     echo "update-rc.d '$name' defaults >/dev/null"
                 ;;
 
-                alpine|gentoo)
+                gentoo)
                     echo "rc-update add '$name' '$target_runlevel'"
                 ;;
 
@@ -70,7 +70,7 @@ case "$state_should" in
                     # 'enable' can be successful and still return a non-zero exit
                     # code, deal with it by checking for success ourselves in that
                     # case (the || ... part).
-                    echo "'/etc/init.d/$name' enable || [ -f /etc/rc.d/S??'$name' ]"
+                    echo "/etc/init.d/$name enable || [ -f /etc/rc.d/S??$name ]"
                 ;;
 
                 ubuntu)
@@ -81,11 +81,6 @@ case "$state_should" in
                     :  # handled in manifest
                 ;;
 
-                openbsd)
-                    # OpenBSD 5.7 and higher
-                    echo "rcctl enable '$name'"
-                ;;
-
                 *)
                    echo "Unsupported os: $os" >&2
                    exit 1
@@ -106,8 +101,8 @@ case "$state_should" in
                     echo "update-rc.d -f '$name' remove"
                 ;;
 
-                alpine|gentoo)
-                    echo "rc-update del '$name' '$target_runlevel'"
+                gentoo)
+                    echo "rc-update del '$name'  '$target_runlevel'"
                 ;;
 
                 centos|fedora|owl|redhat|suse)
@@ -116,11 +111,6 @@ case "$state_should" in
 
                 openwrt)
                     echo "'/etc/init.d/$name' disable"
-                    ;;
-
-                openbsd)
-                    # OpenBSD 5.7 and higher
-                    echo "rcctl disable '$name'"
                 ;;
 
                 *)
diff --git a/cdist/conf/type/__start_on_boot/man.rst b/cdist/conf/type/__start_on_boot/man.rst
index b7c73ab1..851d1a89 100644
--- a/cdist/conf/type/__start_on_boot/man.rst
+++ b/cdist/conf/type/__start_on_boot/man.rst
@@ -55,7 +55,7 @@ Nico Schottelius <nico-cdist--@--schottelius.org>
 
 COPYING
 -------
-Copyright \(C) 2012-2019 Nico Schottelius. You can redistribute it
+Copyright \(C) 2012 Nico Schottelius. You can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation, either version 3 of the
 License, or (at your option) any later version.
diff --git a/cdist/conf/type/__start_on_boot/manifest b/cdist/conf/type/__start_on_boot/manifest
index c1c983ec..b9ee20e2 100644
--- a/cdist/conf/type/__start_on_boot/manifest
+++ b/cdist/conf/type/__start_on_boot/manifest
@@ -16,7 +16,7 @@ case "$os" in
 	else
 	    value='NO'
 	fi
-	__key_value "rcconf-$name-enable" \
+	__key_value rcconf-$name-enable \
 	    --file /etc/rc.conf \
 	    --key "${name}_enable" \
 	    --value "\"$value\"" \
diff --git a/cdist/conf/type/__sysctl/gencode-remote b/cdist/conf/type/__sysctl/gencode-remote
index 711d54e5..a7aedb84 100755
--- a/cdist/conf/type/__sysctl/gencode-remote
+++ b/cdist/conf/type/__sysctl/gencode-remote
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # 2014 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2018 Takashi Yoshi (takashi at yoshi.email)
 #
 # This file is part of cdist.
 #
@@ -29,26 +28,12 @@ fi
 
 os=$(cat "$__global/explorer/os")
 case "$os" in
-   # Linux
-   redhat|centos|ubuntu|debian|devuan|archlinux|gentoo|coreos)
-      flag='-w'
-      ;;
-   # BusyBox
-   alpine|openwrt)
-      flag='-w'
-      ;;
-   macosx)
-      # NOTE: Older versions of Mac OS X require the -w option.
-      #       Even though the flag is not mentioned in new man pages anymore,
-      #       it still works.
-      flag='-w'
-      ;;
-   netbsd)
-      flag='-w'
-      ;;
-   freebsd|openbsd)
-      flag=''
-   ;;
+    redhat|centos|ubuntu|debian|devuan|archlinux|coreos)
+        flag='-w'
+    ;;
+    frebsd)
+        flag=''
+    ;;
 esac
 
 # set the current runtime value
diff --git a/cdist/conf/type/__sysctl/manifest b/cdist/conf/type/__sysctl/manifest
index b4e2e902..6e337ccb 100755
--- a/cdist/conf/type/__sysctl/manifest
+++ b/cdist/conf/type/__sysctl/manifest
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # 2014 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2018 Takashi Yoshi (takashi at yoshi.email)
 #
 # This file is part of cdist.
 #
@@ -23,12 +22,7 @@
 os=$(cat "$__global/explorer/os")
 
 case "$os" in
-   # Linux
-   redhat|centos|ubuntu|debian|devuan|archlinux|coreos)
-      :
-   ;;
-   # BSD
-   freebsd|macosx|netbsd|openbsd)
+   redhat|centos|ubuntu|debian|devuan|archlinux|coreos|freebsd)
       :
    ;;
    *)
diff --git a/cdist/conf/type/__systemd_unit/gencode-remote b/cdist/conf/type/__systemd_unit/gencode-remote
index 967a6c87..60486c52 100644
--- a/cdist/conf/type/__systemd_unit/gencode-remote
+++ b/cdist/conf/type/__systemd_unit/gencode-remote
@@ -23,7 +23,7 @@ state=$(cat "${__object}/parameter/state")
 current_enablement_state=$(cat "${__object}/explorer/enablement-state")
 
 if [ "${state}" = "absent" ]; then
-    if [ -n "${current_enablement_state}" ]; then
+    if [ ! -z "${current_enablement_state}" ]; then
         echo "systemctl --now disable ${name}"
         echo "rm -f /etc/systemd/system/${name}"
         echo "systemctl daemon-reload"
diff --git a/cdist/conf/type/__timezone/gencode-remote b/cdist/conf/type/__timezone/gencode-remote
index 5299f548..1f5066b7 100755
--- a/cdist/conf/type/__timezone/gencode-remote
+++ b/cdist/conf/type/__timezone/gencode-remote
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # 2012 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -30,7 +29,7 @@ if [ "$timezone_is" = "$timezone_should" ]; then
 fi
 
 case "$os" in
-   ubuntu|debian|devuan|coreos|alpine)
-      echo "echo \"$timezone_should\" > /etc/timezone"
+   ubuntu|debian|devuan|coreos)
+      echo "echo '$timezone_should' > /etc/timezone"
    ;;
 esac
diff --git a/cdist/conf/type/__timezone/manifest b/cdist/conf/type/__timezone/manifest
index 3d28ccba..f2017449 100755
--- a/cdist/conf/type/__timezone/manifest
+++ b/cdist/conf/type/__timezone/manifest
@@ -2,7 +2,7 @@
 #
 # 2011 Ramon Salvadó (rsalvado at gnuine dot com)
 # 2012-2015 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2012-2019 Nico Schottelius (nico-cdist at schottelius.org)
+# 2012 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -26,7 +26,7 @@ timezone="$__object_id"
 os=$(cat "$__global/explorer/os")
 
 case "$os" in
-    archlinux|debian|ubuntu|devuan|alpine)
+    archlinux|debian|ubuntu|devuan)
         __package tzdata
         export require="__package/tzdata"
     ;;
@@ -34,11 +34,7 @@ case "$os" in
         __package timezone
         export require="__package/timezone"
     ;;
-    freebsd|netbsd|openbsd)
-        # whitelist
-        :
-    ;;
-    coreos)
+    freebsd|netbsd|coreos)
         # whitelist
         :
     ;;
@@ -52,7 +48,7 @@ case "$os" in
             __key_value ZONE \
                 --file /etc/sysconfig/clock \
                 --delimiter '=' \
-                --value "\"$timezone\""
+                --value "'$timezone'"
     ;;
     *)
         echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
diff --git a/cdist/conf/type/__ufw/gencode-remote b/cdist/conf/type/__ufw/gencode-remote
deleted file mode 100644
index fc62b591..00000000
--- a/cdist/conf/type/__ufw/gencode-remote
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Mark Polyakov (mark--@--markasoftware.com)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-state="$(cat "$__object/parameter/state")"
-
-case "$state" in
-    enabled)
-        echo 'ufw --force enable'
-        ;;
-
-    present)
-        echo 'ufw --force disable'
-        ;;
-    # absent will be uninstalled in manifest
-esac
-
-if [ "$state" != absent ]; then
-    if [ -f "$__object/parameter/logging" ]; then
-        logging="$(cat "$__object/parameter/logging")"
-        case "$logging" in
-            off|low|medium|high|full)
-                echo "ufw --force logging $logging"
-                ;;
-            *)
-                echo 'Logging parameter must be off, low, medium, high, or full!' >&2
-                exit 1
-                ;;
-        esac
-    fi
-
-    for direction in incoming outgoing routed; do
-        if [ -f "$__object/parameter/default_$direction" ]; then
-            treatment="$(cat "$__object/parameter/default_$direction")"
-            case "$treatment" in
-                allow|deny|reject)
-                    echo "ufw --force default $treatment $direction"
-                    ;;
-                *)
-                    echo 'UFW default policies must be either "allow", "deny", or "reject".' >&2
-                    exit 1
-                    ;;
-            esac
-        fi
-    done
-fi
diff --git a/cdist/conf/type/__ufw/man.rst b/cdist/conf/type/__ufw/man.rst
deleted file mode 100644
index cc64fbb5..00000000
--- a/cdist/conf/type/__ufw/man.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-cdist-type__ufw(7)
-==================
-
-NAME
-----
-cdist-type__ufw - Install the Uncomplicated FireWall
-
-
-DESCRIPTION
------------
-Installs the Uncomplicated FireWall. Most modern distributions carry UFW in their main repositories, but on CentOS this type will automatically enable the EPEL repository.
-
-Some global configuration can also be set with this type.
-
-OPTIONAL PARAMETERS
--------------------
-state
-    Either "enabled", "running", "present", or "absent". Defaults to "enabled", which registers UFW to start on boot.
-
-logging
-    Either "off", "low", "medium", "high", or "full". Will be passed to `ufw logging`. If not specified, logging level is not modified.
-
-default_incoming
-    Either "allow", "deny", or "reject". The default policy for dealing with ingress packets.
-    
-default_outgoing
-    Either "allow", "deny", or "reject". The default policy for dealing with egress packets.
-    
-default_routed
-    Either "allow", "deny", or "reject". The default policy for dealing with routed packets (passing through this machine).
-    
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # Install UFW
-    __ufw
-    # Setup UFW with maximum logging and no restrictions on routed packets.
-    __ufw --logging full --default_routed allow
-
-
-SEE ALSO
---------
-:strong:`ufw`\ (8)
-
-
-AUTHORS
--------
-Mark Polyakov <mark@markasoftware.com>
-
-
-COPYING
--------
-Copyright \(C) 2019 Mark Polyakov. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__ufw/manifest b/cdist/conf/type/__ufw/manifest
deleted file mode 100755
index 54309ff5..00000000
--- a/cdist/conf/type/__ufw/manifest
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Mark Polyakov (mark--@--markasoftware.com)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-state="$(cat "$__object/parameter/state")"
-
-case "$state" in
-    present|enabled)
-        os="$(cat "$__global/explorer/os")"
-
-        case "$os" in
-            centos)
-                # shellcheck source=/dev/null
-                if (. "$__global/explorer/os_release" && [ "${VERSION_ID}" = "7" ]); then
-                    __package epel-release
-                    require='__package/epel-release' __package ufw
-                else
-                    echo 'CentOS version 7 is required!'
-                    exit 1
-                fi
-                ;;
-            *)
-                __package ufw
-                ;;
-        esac
-
-        # ufw expects to always be enabled, then uses a switch in /etc to
-        # determine whether to "actually start" after the init system calls it.
-        # So, we have to both enable on bootup through init and run `ufw enable`
-
-        # operators ae left-associative, so if !enabled it will never run
-        if [ "$(cat "$__global/explorer/os")" != ubuntu ] || \
-           [ "$(cat "$__global/explorer/init")" != init ] && \
-           [ "$state" = enabled ]; then
-            # Why don't we disable start_on_boot when state=present|absent?
-            # Because UFW should always be enabled at boot -- /etc/ufw/ufw.conf
-            # will stop it from "really" starting
-            require='__package/ufw' __start_on_boot ufw
-        fi
-        ;;
-
-    absent)
-        __package ufw --state absent
-        ;;
-
-    *)
-        echo 'State must be "enabled", "present", or "absent".'
-        exit 1
-        ;;
-esac
-
diff --git a/cdist/conf/type/__ufw/parameter/default/state b/cdist/conf/type/__ufw/parameter/default/state
deleted file mode 100644
index 26ed6c9b..00000000
--- a/cdist/conf/type/__ufw/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-enabled
\ No newline at end of file
diff --git a/cdist/conf/type/__ufw/parameter/optional b/cdist/conf/type/__ufw/parameter/optional
deleted file mode 100644
index 0a4dec97..00000000
--- a/cdist/conf/type/__ufw/parameter/optional
+++ /dev/null
@@ -1,5 +0,0 @@
-state
-logging
-default_incoming
-default_outgoing
-default_routed
\ No newline at end of file
diff --git a/cdist/conf/type/__ufw/singleton b/cdist/conf/type/__ufw/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__ufw_rule/gencode-remote b/cdist/conf/type/__ufw_rule/gencode-remote
deleted file mode 100755
index 4f1bf2c9..00000000
--- a/cdist/conf/type/__ufw_rule/gencode-remote
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Mark Polyakov (mark@markasoftware.com)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This type does not bother with checking the current state of the rules.
-# While it is possible to retrieve the list of rules in a consistent format from
-# `ufw status`, it is a completely different format than the one used on the
-# command line. I also do not suspect it is any faster.
-
-ufw='ufw --force rule'
-
-case "$(cat "$__object/parameter/state")" in
-    present) ;;
-    absent)
-        ufw="$ufw delete"
-        ;;
-    *)
-        echo 'State must be "present" or "absent".' >&2
-        exit 1
-        ;;
-esac
-
-if [ -f "$__object/parameter/rule" ]; then
-    ufw="$ufw $(cat "$__object/parameter/rule")"
-else
-    ufw="$ufw allow $__object_id"
-fi
-
-echo "$ufw"
diff --git a/cdist/conf/type/__ufw_rule/man.rst b/cdist/conf/type/__ufw_rule/man.rst
deleted file mode 100644
index 996557f8..00000000
--- a/cdist/conf/type/__ufw_rule/man.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-cdist-type__ufw_rule(7)
-=======================
-
-NAME
-----
-cdist-type__ufw_rule - A single UFW rule
-
-
-DESCRIPTION
------------
-Adds or removes a single UFW rule. This type supports adding and deleting rules for port ranges or applications.
-
-Understanding what is "to" and what is "from" can be confusing. If the rule is ingress (default), then "from" is the remote machine and "to" is the local one. The opposite is true for egress traffic (--out).
-
-OPTIONAL PARAMETERS
--------------------
-state
-    Either "present" or "absent". Defaults to "present". If "absent", only removes rules that exactly match the rule expected.
-
-rule
-    A firewall rule in UFW syntax. This is what you would usually write after `ufw` on the command line. Defaults to "allow" followed by the object ID. You can use either the short syntax (just allow|deny|reject|limit followed by a port or application name) or the full syntax. Do not include `delete` in your command. Set `--state absent` instead.
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # open port 80 (ufw allow 80)
-    __ufw_rule 80
-    # Allow mosh application (if installed)
-    __ufw_rule mosh
-    # Allow all traffic from local network (ufw allow from 10.0.0.0/24)
-    __ufw_rule local --rule 'allow from 10.0.0.0/24'
-    # Block egress traffic from port 25 to 111.55.55.55 on interface eth0
-    __ufw_rule block_smtp --rule 'deny out on eth0 from any port 25 to 111.55.55.55'
-
-
-SEE ALSO
---------
-:strong:`ufw`\ (8)
-
-
-AUTHORS
--------
-Mark Polyakov <mark@markasoftware.com>
-
-
-COPYING
--------
-Copyright \(C) 2019 Mark Polyakov. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__ufw_rule/parameter/default/state b/cdist/conf/type/__ufw_rule/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__ufw_rule/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__ufw_rule/parameter/optional b/cdist/conf/type/__ufw_rule/parameter/optional
deleted file mode 100644
index 0732d53d..00000000
--- a/cdist/conf/type/__ufw_rule/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-state
-rule
diff --git a/cdist/conf/type/__user/explorer/shadow b/cdist/conf/type/__user/explorer/shadow
index c49992d5..32d0d56a 100755
--- a/cdist/conf/type/__user/explorer/shadow
+++ b/cdist/conf/type/__user/explorer/shadow
@@ -22,7 +22,7 @@
 #
 
 name=$__object_id
-os="$("$__explorer/os")"
+os="$("$__explorer"/os)"
 # Default to using shadow passwords
 database="shadow"
 
diff --git a/cdist/conf/type/__user/gencode-remote b/cdist/conf/type/__user/gencode-remote
index ee18c18f..b908874b 100755
--- a/cdist/conf/type/__user/gencode-remote
+++ b/cdist/conf/type/__user/gencode-remote
@@ -3,7 +3,6 @@
 # 2011 Steven Armstrong (steven-cdist at armstrong.cc)
 # 2011 Nico Schottelius (nico-cdist at schottelius.org)
 # 2013 Daniel Heule (hda at sfs.biz)
-# 2018 Thomas Eckert (tom at it-eckert.de)
 #
 # This file is part of cdist.
 #
@@ -131,17 +130,13 @@ if [ "$state" = "present" ]; then
           echo useradd "$@" "$name"
        fi
     fi
-elif [ "$state" = "absent" ]; then
+else
     if grep -q "^${name}:" "$__object/explorer/passwd"; then
         #user exists, but state != present, so delete it
         if [ -f "$__object/parameter/remove-home" ]; then
-            printf "userdel -r '%s' >/dev/null 2>&1\\n" "${name}"
-	    echo "userdel -r" >> "$__messages_out"
+            echo userdel -r "${name}"
         else
-            printf "userdel '%s' >/dev/null 2>&1\\n" "${name}"
-	    echo "userdel" >> "$__messages_out"
+            echo userdel "${name}"
         fi
     fi
-else
-    echo "Invalid state $state" >&2
 fi
diff --git a/cdist/conf/type/__user/man.rst b/cdist/conf/type/__user/man.rst
index ef6b77af..5001bfa4 100644
--- a/cdist/conf/type/__user/man.rst
+++ b/cdist/conf/type/__user/man.rst
@@ -60,11 +60,6 @@ mod
 add
     New user added
 
-userdel -r
-    If user was deleted with homedir
-
-userdel
-    If user was deleted (keeping homedir)
 
 EXAMPLES
 --------
diff --git a/cdist/conf/type/__user_groups/gencode-remote b/cdist/conf/type/__user_groups/gencode-remote
index 8120761a..df84faaf 100755
--- a/cdist/conf/type/__user_groups/gencode-remote
+++ b/cdist/conf/type/__user_groups/gencode-remote
@@ -44,23 +44,23 @@ fi
 for group in $changed_groups; do
    if [ "$os" = "netbsd" ] || [ "$os" = "openbsd" ]; then
       case "$state_should" in
-         present) echo "usermod -G \"$group\" \"$user\"" ;;
+         present) echo "usermod -G '$group' '$user'" ;;
          absent) echo 'NetBSD and OpenBSD do not have a command to remove a user from a group' >&2 ; exit 1 ;;
       esac
    elif [ "$os" = "freebsd" ]; then
       case "$state_should" in
-         present) echo "pw groupmod \"$group\" -m \"$user\"" ;;
-         absent) echo "pw groupmod \"$group\" -d \"$user\"" ;;
+         present) echo "pw groupmod '$group' -m '$user'" ;;
+         absent) echo "pw groupmod '$group' -d '$user'" ;;
       esac
    elif [ "$oldusermod" = "true" ]; then
       case "$state_should" in
-         present) echo "usermod -A \"$group\" \"$user\"" ;;
-         absent) echo "usermod -R \"$group\" \"$user\"" ;;
+         present) echo "usermod -A '$group' '$user'" ;;
+         absent) echo "usermod -R '$group' '$user'" ;;
       esac
    else
       case "$state_should" in
-         present) echo "gpasswd -a \"$user\" \"$group\"" ;;
-         absent) echo "gpasswd -d \"$user\" \"$group\"" ;;
+         present) echo "gpasswd -a '$user' '$group'" ;;
+         absent) echo "gpasswd -d '$user' '$group'" ;;
       esac
    fi
 done
diff --git a/cdist/conf/type/__yum_repo/files/repo.template b/cdist/conf/type/__yum_repo/files/repo.template
index 18ea9d2b..3e14c8b6 100755
--- a/cdist/conf/type/__yum_repo/files/repo.template
+++ b/cdist/conf/type/__yum_repo/files/repo.template
@@ -43,7 +43,7 @@ for key in baseurl gpgkey; do
    if [ -f "$__object/parameter/$key" ]; then
       printf '%s=' "$key"
       prefix=''
-      while read -r line; do
+      while read line; do
          printf '%s%s\n' "$prefix" "$line"
          prefix='   '
       done < "$__object/parameter/$key"
diff --git a/cdist/conf/type/__zypper_repo/explorer/all_repo_ids b/cdist/conf/type/__zypper_repo/explorer/all_repo_ids
index 7953158a..dde6d554 100644
--- a/cdist/conf/type/__zypper_repo/explorer/all_repo_ids
+++ b/cdist/conf/type/__zypper_repo/explorer/all_repo_ids
@@ -21,5 +21,4 @@
 # Retrieve all repo id nummbers - parsed zypper output
 #
 #
-# shellcheck disable=SC2005,SC2046
-echo $(zypper lr | cut -d'|' -f 1 | grep -E '^[0-9]')
+zypper lr | cut -d'|' -f 1 | grep -E '^[0-9]'
diff --git a/cdist/conf/type/__zypper_repo/explorer/enabled_repo_ids b/cdist/conf/type/__zypper_repo/explorer/enabled_repo_ids
index 261d6073..b011c258 100644
--- a/cdist/conf/type/__zypper_repo/explorer/enabled_repo_ids
+++ b/cdist/conf/type/__zypper_repo/explorer/enabled_repo_ids
@@ -23,6 +23,4 @@
 #
 # simpler command which works only on SLES11 SP3 or newer:
 # echo $(zypper lr -E | cut -d'|' -f 1 | grep -E '^[0-9]')
-#
-# shellcheck disable=SC2005,SC2046
-echo $(zypper lr |  grep -E '^[0-9]([^|]+\|){3,3} Yes' | cut -d'|' -f 1)
+zypper lr |  grep -E '^[0-9]([^|]+\|){3,3} Yes' | cut -d'|' -f 1
diff --git a/cdist/conf/type/__zypper_repo/explorer/repo_id b/cdist/conf/type/__zypper_repo/explorer/repo_id
index d55a5cac..114c6fe7 100644
--- a/cdist/conf/type/__zypper_repo/explorer/repo_id
+++ b/cdist/conf/type/__zypper_repo/explorer/repo_id
@@ -26,5 +26,4 @@ if [ -f "$__object/parameter/uri" ]; then
 else
    uri="$__object_id"
 fi
-# shellcheck disable=SC2005,SC2046
-echo $(zypper lr -u | grep -F "$uri" | cut -d'|' -f 1 | grep -E '^[0-9]')
+zypper lr -u | grep -F "$uri" | cut -d'|' -f 1 | grep -E '^[0-9]'
diff --git a/cdist/conf/type/__zypper_repo/gencode-remote b/cdist/conf/type/__zypper_repo/gencode-remote
index 336488ae..94c3f146 100755
--- a/cdist/conf/type/__zypper_repo/gencode-remote
+++ b/cdist/conf/type/__zypper_repo/gencode-remote
@@ -70,25 +70,25 @@ case "$state" in
          fi
          if [ -z "$repo_id" ]; then
              # Repo not present, so we need to create it 
-             echo "zypper $zypper_def_opts addrepo '$uri' '$desc'"
+             echo zypper $zypper_def_opts addrepo "'$uri'" "'$desc'"
          fi
    ;;
    absent)
-         if [ -n "$act_id" ]; then
+         if [ ! -z "$act_id" ]; then
              # Repo present (act_id not ""), so we ned to delete it
-             echo "zypper $zypper_def_opts removerepo $act_id"
+             echo zypper $zypper_def_opts removerepo "$act_id"
          fi
    ;;
    enabled)
-         if [ -n "$act_id" ] && [ "$repostate" = "disabled" ]; then
+         if [ ! -z "$act_id" ] && [ "$repostate" = "disabled" ]; then
              # Repo present (act_id not "") and repostate not enabled, so a enable call is needed
-             echo "zypper $zypper_def_opts modifyrepo -e $act_id"
+             echo zypper $zypper_def_opts modifyrepo -e "$act_id"
          fi
    ;;
    disabled)
-         if [ -n "$act_id" ] && [ "$repostate" = "enabled" ]; then
+         if [ ! -z "$act_id" ] && [ "$repostate" = "enabled" ]; then
              # Repo present (act_id not "") and repostate enabled, so a disable call is needed
-             echo "zypper $zypper_def_opts modifyrepo -d $act_id"
+             echo zypper $zypper_def_opts modifyrepo -d "$act_id"
          fi
    ;;
    *)
diff --git a/cdist/conf/type/__zypper_service/explorer/repo_ids b/cdist/conf/type/__zypper_service/explorer/repo_ids
index da506fea..787e9869 100644
--- a/cdist/conf/type/__zypper_service/explorer/repo_ids
+++ b/cdist/conf/type/__zypper_service/explorer/repo_ids
@@ -24,6 +24,4 @@
 # simpler command which works only on SLES11 SP3 or newer:
 # echo $(zypper lr -u -E | cut -d'|' -f 1 | grep -E '^[0-9]')
 # on older systems, zypper doesn't know the parameter -E 
-#
-# shellcheck disable=SC2005,SC2046
-echo $(zypper lr -u | grep -E '^([^|]+\|){3,3} Yes' | cut -d'|' -f 1 | grep -E '^[0-9]')
+zypper lr -u | grep -E '^([^|]+\|){3,3} Yes' | cut -d'|' -f 1 | grep -E '^[0-9]'
diff --git a/cdist/conf/type/__zypper_service/explorer/service_id b/cdist/conf/type/__zypper_service/explorer/service_id
index fbb983c8..91858d84 100644
--- a/cdist/conf/type/__zypper_service/explorer/service_id
+++ b/cdist/conf/type/__zypper_service/explorer/service_id
@@ -27,6 +27,4 @@ else
 fi
 # simpler command which works only on SLES11 SP3 or newer:
 # echo $(zypper ls -u -E | grep -E "\<$uri\>" | cut -d'|' -f 1 )
-#
-# shellcheck disable=SC2005,SC2046
-echo $(zypper ls -u | grep -E '^([^|]+\|){3,3} Yes' | grep -E "\\<$uri\\>" | cut -d'|' -f 1)
+zypper ls -u | grep -E '^([^|]+\|){3,3} Yes' | grep -E "\<$uri\>" | cut -d'|' -f 1
diff --git a/cdist/conf/type/__zypper_service/explorer/service_ids b/cdist/conf/type/__zypper_service/explorer/service_ids
index 5a26740e..6491ab90 100644
--- a/cdist/conf/type/__zypper_service/explorer/service_ids
+++ b/cdist/conf/type/__zypper_service/explorer/service_ids
@@ -22,6 +22,4 @@
 #
 # simpler command which works only on SLES11 SP3 or newer:
 # echo $(zypper ls -u -E | cut -d'|' -f 1 | grep -E '^[0-9]')
-#
-# shellcheck disable=SC2005,SC2046
-echo $(zypper ls -u | grep -E '^([^|]+\|){3,3} Yes' | cut -d'|' -f 1 | grep -E '^[0-9]')
+zypper ls -u | grep -E '^([^|]+\|){3,3} Yes' | cut -d'|' -f 1 | grep -E '^[0-9]'
diff --git a/cdist/conf/type/__zypper_service/explorer/service_uri b/cdist/conf/type/__zypper_service/explorer/service_uri
index 2f3d0f94..2476ab71 100644
--- a/cdist/conf/type/__zypper_service/explorer/service_uri
+++ b/cdist/conf/type/__zypper_service/explorer/service_uri
@@ -25,5 +25,4 @@ if [ -f "$__object/parameter/uri" ]; then
 else
    uri="/$__object_id"
 fi
-# shellcheck disable=SC2005,SC2046
-echo $(zypper ls -u | awk 'BEGIN { FS = "[ ]+\\|[ ]+" } ; $4 == "Yes" && $NF == "'"$uri"'" {print $NF}')
+zypper ls -u | awk 'BEGIN { FS = "[ ]+\\|[ ]+" } ; $4 == "Yes" && $NF == "'"$uri"'" {print $NF}'
diff --git a/cdist/conf/type/__zypper_service/gencode-remote b/cdist/conf/type/__zypper_service/gencode-remote
index 4ccfe301..413a43ab 100755
--- a/cdist/conf/type/__zypper_service/gencode-remote
+++ b/cdist/conf/type/__zypper_service/gencode-remote
@@ -59,10 +59,10 @@ if [ -f "$__object/parameter/remove-all-other-services" ]; then
    # file exists -> True
    for i in $exp_ids; do
      if [ "$i" != "$exp_id" ] ; then
-       echo "zypper $zypper_def_opts  removeservice $i &>/dev/null"
+       echo zypper $zypper_def_opts  removeservice "$i" "&>/dev/null"
      fi
    done 
-   echo "zypper $zypper_def_opts refs &>/dev/null"
+   echo zypper $zypper_def_opts refs "&>/dev/null"
 fi
 
 
@@ -71,12 +71,12 @@ fi
 
 case "$state_should" in
    present)
-         echo "zypper $zypper_def_opts addservice -t $stype $uri '$desc'"
+         echo "zypper $zypper_def_opts addservice -t '$stype' '$uri' '$desc'"
          echo "zypper $zypper_def_opts refs"
          echo "zypper $zypper_def_opts ref"
    ;;
    absent)
-         echo "zypper $zypper_def_opts removeservice $exp_id"
+         echo "zypper $zypper_def_opts removeservice '$service_id'"
          echo "zypper $zypper_def_opts refs"
          echo "zypper $zypper_def_opts ref"
    ;;
diff --git a/cdist/conf/type/__zypper_service/man.rst b/cdist/conf/type/__zypper_service/man.rst
index e082dc02..ea48aebb 100644
--- a/cdist/conf/type/__zypper_service/man.rst
+++ b/cdist/conf/type/__zypper_service/man.rst
@@ -46,10 +46,10 @@ EXAMPLES
     # Ensure that internal SLES11 SP3 RIS is in installed and all other services and repos are discarded
     __zypper_service INTERNAL_SLES11_SP3 --service_desc "Internal SLES11 SP3 RIS" --uri "http://path/to/your/ris/dir" --remove-all-other-services --remove-all-repos
 
-    # Ensure that internal SLES11 SP3 RIS is in installed, no changes to other services or repos
+    # Ensure that internal SLES11 SP3 RIS is in installed, no changes to ohter services or repos
     __zypper_service INTERNAL_SLES11_SP3 --service_desc "Internal SLES11 SP3 RIS" --uri "http://path/to/your/ris/dir"
 
-    # Drop service by uri, no changes to other services or repos
+    # Drop service by uri, no changes to ohter services or repos
     __zypper_service INTERNAL_SLES11_SP3 --state absent --uri "http://path/to/your/ris/dir"
 
 
diff --git a/cdist/config.py b/cdist/config.py
index 26d07fc4..e8fd5384 100644
--- a/cdist/config.py
+++ b/cdist/config.py
@@ -43,33 +43,6 @@ from cdist import core, inventory
 from cdist.util.remoteutil import inspect_ssh_mux_opts
 
 
-def graph_check_cycle(graph):
-    # Start from each node in the graph and check for cycle starting from it.
-    for node in graph:
-        # Cycle path.
-        path = [node]
-        has_cycle = _graph_dfs_cycle(graph, node, path)
-        if has_cycle:
-            return has_cycle, path
-    return False, None
-
-
-def _graph_dfs_cycle(graph, node, path):
-    for neighbour in graph.get(node, ()):
-        # If node is already in path then this is cycle.
-        if neighbour in path:
-            path.append(neighbour)
-            return True
-        path.append(neighbour)
-        rv = _graph_dfs_cycle(graph, neighbour, path)
-        if rv:
-            return True
-        # Remove last item from list - neighbour whose DFS path we have have
-        # just checked.
-        del path[-1]
-    return False
-
-
 class Config(object):
     """Cdist main class to hold arbitrary data"""
 
@@ -104,12 +77,9 @@ class Config(object):
         self.remove_remote_files_dirs = remove_remote_files_dirs
 
         self.explorer = core.Explorer(self.local.target_host, self.local,
-                                      self.remote, jobs=self.jobs,
-                                      dry_run=self.dry_run)
-        self.manifest = core.Manifest(self.local.target_host, self.local,
-                                      dry_run=self.dry_run)
-        self.code = core.Code(self.local.target_host, self.local, self.remote,
-                              dry_run=self.dry_run)
+                                      self.remote, jobs=self.jobs)
+        self.manifest = core.Manifest(self.local.target_host, self.local)
+        self.code = core.Code(self.local.target_host, self.local, self.remote)
 
     def _init_files_dirs(self):
         """Prepare files and directories for the run"""
@@ -284,14 +254,14 @@ class Config(object):
                     cls.onehost(host, host_tags, host_base_path, hostdir,
                                 args, parallel=False,
                                 configuration=configuration)
-                except cdist.Error:
+                except cdist.Error as e:
                     failed_hosts.append(host)
         if args.parallel and len(process_args) == 1:
             log.debug("Only 1 host for parallel processing, doing it "
                       "sequentially")
             try:
                 cls.onehost(*process_args[0])
-            except cdist.Error:
+            except cdist.Error as e:
                 failed_hosts.append(host)
         elif args.parallel:
             log.trace("Multiprocessing start method is {}".format(
@@ -586,19 +556,19 @@ class Config(object):
             self.log.trace("Multiprocessing cargo_types: %s", cargo_types)
             nt = len(cargo_types)
             if nt == 1:
-                self.log.debug(("Only one type, transferring explorers "
+                self.log.debug(("Only one type, transfering explorers "
                                 "sequentially"))
                 self.explorer.transfer_type_explorers(cargo_types.pop())
             else:
                 self.log.trace(("Starting multiprocessing Pool for {} "
-                                "parallel types explorers transferring".format(
+                                "parallel transfering types' explorers".format(
                                     nt)))
                 args = [
                     (ct, ) for ct in cargo_types
                 ]
                 mp_pool_run(self.explorer.transfer_type_explorers, args,
                             jobs=self.jobs)
-                self.log.trace(("Multiprocessing for parallel transferring "
+                self.log.trace(("Multiprocessing for parallel transfering "
                                 "types' explorers finished"))
 
             self.log.trace(("Starting multiprocessing Pool for {} parallel "
@@ -683,28 +653,6 @@ class Config(object):
         self.__dict__.update(state)
         self._open_logger()
 
-    def _validate_dependencies(self):
-        '''
-            Build dependency graph for unfinished objects and
-            check for cycles.
-        '''
-        graph = {}
-        for cdist_object in self.object_list():
-            obj_name = cdist_object.name
-            if obj_name not in graph:
-                graph[obj_name] = []
-            if cdist_object.state == cdist_object.STATE_DONE:
-                continue
-
-            for requirement in cdist_object.requirements_unfinished(
-                    cdist_object.requirements):
-                graph[obj_name].append(requirement.name)
-
-            for requirement in cdist_object.requirements_unfinished(
-                    cdist_object.autorequire):
-                graph[obj_name].append(requirement.name)
-        return graph_check_cycle(graph)
-
     def iterate_until_finished(self):
         """
             Go through all objects and solve them
@@ -714,12 +662,6 @@ class Config(object):
         objects_changed = True
 
         while objects_changed:
-            # Check for cycles as early as possible.
-            has_cycle, path = self._validate_dependencies()
-            if has_cycle:
-                raise cdist.UnresolvableRequirementsError(
-                    "Cycle detected in object dependencies:\n{}!".format(
-                        " -> ".join(path)))
             objects_changed = self.iterate_once()
 
         # Check whether all objects have been finished
@@ -758,34 +700,14 @@ class Config(object):
                     ("The requirements of the following objects could not be "
                      "resolved:\n%s") % ("\n".join(info_string)))
 
-    def _handle_deprecation(self, cdist_object):
-        cdist_type = cdist_object.cdist_type
-        deprecated = cdist_type.deprecated
-        if deprecated is not None:
-            if deprecated:
-                self.log.warning("Type %s is deprecated: %s", cdist_type.name,
-                                 deprecated)
-            else:
-                self.log.warning("Type %s is deprecated.", cdist_type.name)
-        for param in cdist_object.parameters:
-            if param in cdist_type.deprecated_parameters:
-                msg = cdist_type.deprecated_parameters[param]
-                if msg:
-                    format = "%s parameter of type %s is deprecated: %s"
-                    args = [param, cdist_type.name, msg]
-                else:
-                    format = "%s parameter of type %s is deprecated."
-                    args = [param, cdist_type.name]
-                self.log.warning(format, *args)
-
     def object_prepare(self, cdist_object, transfer_type_explorers=True):
         """Prepare object: Run type explorer + manifest"""
-        self._handle_deprecation(cdist_object)
-        self.log.verbose("Preparing object {}".format(cdist_object.name))
-        self.log.verbose(
-            "Running manifest and explorers for " + cdist_object.name)
-        self.explorer.run_type_explorers(cdist_object, transfer_type_explorers)
         try:
+            self.log.verbose("Preparing object {}".format(cdist_object.name))
+            self.log.verbose(
+                    "Running manifest and explorers for " + cdist_object.name)
+            self.explorer.run_type_explorers(cdist_object,
+                                             transfer_type_explorers)
             self.manifest.run_type_manifest(cdist_object)
             cdist_object.state = core.CdistObject.STATE_PREPARED
         except cdist.Error as e:
diff --git a/cdist/core/cdist_object.py b/cdist/core/cdist_object.py
index 237f0ddd..e2cd22a2 100644
--- a/cdist/core/cdist_object.py
+++ b/cdist/core/cdist_object.py
@@ -108,9 +108,7 @@ class CdistObject(object):
 
     @staticmethod
     def split_name(object_name):
-        """split_name('__type_name/the/object_id')
-           ->
-           ('__type_name', 'the/object_id')
+        """split_name('__type_name/the/object_id') -> ('__type_name', 'the/object_id')
 
         Split the given object name into it's type and object_id parts.
 
@@ -121,9 +119,7 @@ class CdistObject(object):
 
     @staticmethod
     def join_name(type_name, object_id):
-        """join_name('__type_name', 'the/object_id')
-           ->
-           __type_name/the/object_id'
+        """join_name('__type_name', 'the/object_id') -> __type_name/the/object_id'
 
         Join the given type_name and object_id into an object name.
 
@@ -166,8 +162,7 @@ class CdistObject(object):
         # (parameters: %s)" % (self.cdist_type.name, self.parameters))
 
     def object_from_name(self, object_name):
-        """Convenience method for creating an object instance from an object
-        name.
+        """Convenience method for creating an object instance from an object name.
 
         Mainly intended to create objects when resolving requirements.
 
diff --git a/cdist/core/cdist_type.py b/cdist/core/cdist_type.py
index 4500f50d..99e40e70 100644
--- a/cdist/core/cdist_type.py
+++ b/cdist/core/cdist_type.py
@@ -69,7 +69,6 @@ class CdistType(object):
         self.__optional_multiple_parameters = None
         self.__boolean_parameters = None
         self.__parameter_defaults = None
-        self.__deprecated_parameters = None
 
     def __hash__(self):
         return hash(self.name)
@@ -134,17 +133,6 @@ class CdistType(object):
            cannot run in parallel."""
         return os.path.isfile(os.path.join(self.absolute_path, "nonparallel"))
 
-    @property
-    def deprecated(self):
-        """Get type deprecation message. If message is None then type
-        is not deprecated."""
-        deprecated_path = os.path.join(self.absolute_path, "deprecated")
-        try:
-            with open(deprecated_path, 'r') as f:
-                return f.read()
-        except FileNotFoundError:
-            return None
-
     @property
     def explorers(self):
         """Return a list of available explorers"""
@@ -276,23 +264,3 @@ class CdistType(object):
             finally:
                 self.__parameter_defaults = defaults
         return self.__parameter_defaults
-
-    @property
-    def deprecated_parameters(self):
-        if not self.__deprecated_parameters:
-            deprecated = {}
-            try:
-                deprecated_dir = os.path.join(self.absolute_path,
-                                              "parameter",
-                                              "deprecated")
-                for name in cdist.core.listdir(deprecated_dir):
-                    try:
-                        with open(os.path.join(deprecated_dir, name)) as fd:
-                            deprecated[name] = fd.read().strip()
-                    except EnvironmentError:
-                        pass  # Swallow errors raised by open() or read()
-            except EnvironmentError:
-                pass  # Swallow error raised by os.listdir()
-            finally:
-                self.__deprecated_parameters = deprecated
-        return self.__deprecated_parameters
diff --git a/cdist/core/code.py b/cdist/core/code.py
index 1550880a..670029ed 100644
--- a/cdist/core/code.py
+++ b/cdist/core/code.py
@@ -97,7 +97,7 @@ class Code(object):
 
     """
     # target_host is tuple (target_host, target_hostname, target_fqdn)
-    def __init__(self, target_host, local, remote, dry_run=False):
+    def __init__(self, target_host, local, remote):
         self.target_host = target_host
         self.local = local
         self.remote = remote
@@ -113,9 +113,6 @@ class Code(object):
                 local.log),
         }
 
-        if dry_run:
-            self.env['__cdist_dry_run'] = '1'
-
     def _run_gencode(self, cdist_object, which):
         cdist_type = cdist_object.cdist_type
         script = os.path.join(self.local.type_path,
diff --git a/cdist/core/explorer.py b/cdist/core/explorer.py
index 353d7681..a42b0117 100644
--- a/cdist/core/explorer.py
+++ b/cdist/core/explorer.py
@@ -67,7 +67,7 @@ class Explorer(object):
     """Executes cdist explorers.
 
     """
-    def __init__(self, target_host, local, remote, jobs=None, dry_run=False):
+    def __init__(self, target_host, local, remote, jobs=None):
         self.target_host = target_host
 
         self._open_logger()
@@ -84,10 +84,6 @@ class Explorer(object):
             '__cdist_log_level_name': util.log_level_name_env_var_val(
                 self.log),
         }
-
-        if dry_run:
-            self.env['__cdist_dry_run'] = '1'
-
         self._type_explorers_transferred = []
         self.jobs = jobs
 
@@ -113,17 +109,10 @@ class Explorer(object):
             self._run_global_explorers_parallel(out_path)
 
     def _run_global_explorer(self, explorer, out_path):
-        try:
-            path = os.path.join(out_path, explorer)
-            output = self.run_global_explorer(explorer)
-            with open(path, 'w') as fd:
-                fd.write(output)
-        except cdist.Error as e:
-            local_path = os.path.join(self.local.global_explorer_path,
-                                      explorer)
-            stderr_path = os.path.join(self.local.stderr_base_path, "remote")
-            raise cdist.GlobalExplorerError(explorer, local_path, stderr_path,
-                                            e)
+        output = self.run_global_explorer(explorer)
+        path = os.path.join(out_path, explorer)
+        with open(path, 'w') as fd:
+            fd.write(output)
 
     def _run_global_explorers_seq(self, out_path):
         self.log.debug("Running global explorers sequentially")
@@ -187,31 +176,21 @@ class Explorer(object):
         self.log.verbose("Running type explorers for {}".format(
             cdist_object.cdist_type))
         if transfer_type_explorers:
-            self.log.trace("Transferring type explorers for type: %s",
+            self.log.trace("Transfering type explorers for type: %s",
                            cdist_object.cdist_type)
             self.transfer_type_explorers(cdist_object.cdist_type)
         else:
-            self.log.trace(("No need for transferring type explorers for "
+            self.log.trace(("No need for transfering type explorers for "
                             "type: %s"),
                            cdist_object.cdist_type)
-        self.log.trace("Transferring object parameters for object: %s",
+        self.log.trace("Transfering object parameters for object: %s",
                        cdist_object.name)
         self.transfer_object_parameters(cdist_object)
-        cdist_type = cdist_object.cdist_type
-        for explorer in self.list_type_explorer_names(cdist_type):
+        for explorer in self.list_type_explorer_names(cdist_object.cdist_type):
+            output = self.run_type_explorer(explorer, cdist_object)
             self.log.trace("Running type explorer '%s' for object '%s'",
                            explorer, cdist_object.name)
-            try:
-                output = self.run_type_explorer(explorer, cdist_object)
-                cdist_object.explorers[explorer] = output
-            except cdist.Error as e:
-                path = os.path.join(self.local.type_path,
-                                    cdist_type.explorer_path,
-                                    explorer)
-                stderr_path = os.path.join(self.local.stderr_base_path,
-                                           "remote")
-                raise cdist.CdistObjectExplorerError(
-                    cdist_object, explorer, path, stderr_path, e)
+            cdist_object.explorers[explorer] = output
 
     def run_type_explorer(self, explorer, cdist_object):
         """Run the given type explorer for the given object and return
diff --git a/cdist/core/manifest.py b/cdist/core/manifest.py
index 07af0ef8..938ad8b8 100644
--- a/cdist/core/manifest.py
+++ b/cdist/core/manifest.py
@@ -96,7 +96,7 @@ class Manifest(object):
     """Executes cdist manifests.
 
     """
-    def __init__(self, target_host, local, dry_run=False):
+    def __init__(self, target_host, local):
         self.target_host = target_host
         self.local = local
 
@@ -117,9 +117,6 @@ class Manifest(object):
                 self.log),
         }
 
-        if dry_run:
-            self.env['__cdist_dry_run'] = '1'
-
     def _open_logger(self):
         self.log = logging.getLogger(self.target_host[0])
 
diff --git a/cdist/emulator.py b/cdist/emulator.py
index 3cf82f84..4123a353 100644
--- a/cdist/emulator.py
+++ b/cdist/emulator.py
@@ -182,29 +182,6 @@ class Emulator(object):
         lockfname = lockfname.replace(os.sep, '_')
         self.flock_path = os.path.join(self.object_base_path, lockfname)
 
-    def _object_params_in_context(self):
-        ''' Get cdist_object parameters dict adopted by context.
-        Context consists of cdist_type boolean, optional, required,
-        optional_multiple and required_multiple parameters. If parameter
-        is multiple parameter then its value is a list.
-        This adaptation works on cdist_object.parameters which are read from
-        directory based dict where it is unknown what kind of data is in
-        file. If there is only one line in the file it is unknown if this
-        is a value of required/optional parameter or if it is one value of
-        multiple values parameter.
-        '''
-        params = {}
-        if self.cdist_object.exists:
-            for param in self.cdist_object.parameters:
-                value = ('' if param in self.cdist_type.boolean_parameters
-                         else self.cdist_object.parameters[param])
-                if ((param in self.cdist_type.required_multiple_parameters or
-                     param in self.cdist_type.optional_multiple_parameters) and
-                        not isinstance(value, list)):
-                    value = [value]
-                params[param] = value
-        return params
-
     def setup_object(self):
         # Create object with given parameters
         self.parameters = {}
@@ -216,13 +193,12 @@ class Emulator(object):
             # Make existing requirements a set so that we can compare it
             # later with new requirements.
             self._existing_reqs = set(self.cdist_object.requirements)
-            obj_params = self._object_params_in_context()
-            if obj_params != self.parameters:
+            if self.cdist_object.parameters != self.parameters:
                 errmsg = ("Object %s already exists with conflicting "
                           "parameters:\n%s: %s\n%s: %s" % (
                               self.cdist_object.name,
                               " ".join(self.cdist_object.source),
-                              obj_params,
+                              self.cdist_object.parameters,
                               self.object_source,
                               self.parameters))
                 raise cdist.Error(errmsg)
@@ -276,15 +252,14 @@ class Emulator(object):
                                 self.cdist_object.name,
                                 requirement, e.name, self.object_source)))
             raise
-        except core.cdist_object.MissingObjectIdError:
+        except core.cdist_object.MissingObjectIdError as e:
             self.log.error(("%s requires object %s without object id."
                             " Defined at %s" % (self.cdist_object.name,
                                                 requirement,
                                                 self.object_source)))
             raise
 
-        self.log.debug("Recording requirement %s for %s",
-                       requirement, self.cdist_object.name)
+        self.log.debug("Recording requirement: %s", requirement)
 
         # Save the sanitised version, not the user supplied one
         # (__file//bar => __file/bar)
@@ -306,28 +281,13 @@ class Emulator(object):
                 # get the type created before this one ...
                 try:
                     lastcreatedtype = typecreationorder[-2].strip()
-                    # __object_name is the name of the object whose type
-                    # manifest is currently executed
-                    __object_name = self.env.get('__object_name', None)
-                    if lastcreatedtype == __object_name:
-                        self.log.debug(("Not injecting require for "
-                                        "CDIST_ORDER_DEPENDENCY: %s for %s,"
-                                        " %s's type manifest is currently"
-                                        " being executed"),
-                                       lastcreatedtype,
-                                       self.cdist_object.name,
-                                       lastcreatedtype)
+                    if 'require' in self.env:
+                        self.env['require'] += " " + lastcreatedtype
                     else:
-                        if 'require' in self.env:
-                            appendix = " " + lastcreatedtype
-                            if appendix not in self.env['require']:
-                                self.env['require'] += appendix
-                        else:
-                            self.env['require'] = lastcreatedtype
-                        self.log.debug(("Injecting require for "
-                                        "CDIST_ORDER_DEPENDENCY: %s for %s"),
-                                       lastcreatedtype,
-                                       self.cdist_object.name)
+                        self.env['require'] = lastcreatedtype
+                    self.log.debug(("Injecting require for "
+                                    "CDIST_ORDER_DEPENDENCY: %s for %s"),
+                                   lastcreatedtype, self.cdist_object.name)
                 except IndexError:
                     # if no second last line, we are on the first type,
                     # so do not set a requirement
@@ -376,6 +336,4 @@ class Emulator(object):
             # But only if the user hasn't said otherwise.
             # Must prevent circular dependencies.
             if parent.name not in current_object.requirements:
-                self.log.debug("Recording autorequirement %s for %s",
-                               current_object.name, parent.name)
                 parent.autorequire.append(current_object.name)
diff --git a/cdist/exec/remote.py b/cdist/exec/remote.py
index e0ef66ec..ffb3ee00 100644
--- a/cdist/exec/remote.py
+++ b/cdist/exec/remote.py
@@ -190,7 +190,7 @@ class Remote(object):
                     self.log.trace(
                         "Archiving mode desttarpath: %s", desttarpath)
                     # transfer archive to the remote side
-                    self.log.trace("Archiving mode: transferring")
+                    self.log.trace("Archiving mode: transfering")
                     self._transfer_file(tarpath, desttarpath)
                     # extract archive at the remote
                     self.log.trace("Archiving mode: extracting")
@@ -248,15 +248,15 @@ class Remote(object):
         # variable declarations
 
         # cdist command prepended with variable assignments expects
-        # POSIX shell (bourne, bash) at the remote as user default shell.
-        # If remote user shell isn't POSIX shell, but for e.g. csh/tcsh
+        # posix shell (bourne, bash) at the remote as user default shell.
+        # If remote user shell isn't poxis shell, but for e.g. csh/tcsh
         # then these var assignments are not var assignments for this
         # remote shell, it tries to execute it as a command and fails.
         # So really do this by default:
         # /bin/sh -c 'export <var assignments>; command'
         # so that constructed remote command isn't dependent on remote
         # shell. Do this only if env is not None. env breaks this.
-        # Explicitly use /bin/sh, because var assignments assume POSIX
+        # Explicitly use /bin/sh, because var assignments assume poxis
         # shell already.
         # This leaves the posibility to write script that needs to be run
         # remotely in e.g. csh and setting up CDIST_REMOTE_SHELL to e.g.
@@ -304,7 +304,6 @@ class Remote(object):
         try:
             if self.quiet_mode:
                 stderr = subprocess.DEVNULL
-                close_stderr = False
             if return_output:
                 output = subprocess.check_output(command, env=os_environ,
                                                  stderr=stderr).decode()
diff --git a/cdist/inventory.py b/cdist/inventory.py
index 138a2034..7da306fa 100644
--- a/cdist/inventory.py
+++ b/cdist/inventory.py
@@ -315,7 +315,7 @@ class InventoryHost(Inventory):
         hostpath = self._host_path(host)
         self.log.trace("hostpath: {}".format(hostpath))
         if self.action == "add" and not os.path.exists(hostpath):
-            self._new_hostpath(hostpath)
+                self._new_hostpath(hostpath)
         else:
             if not os.path.isfile(hostpath):
                 raise cdist.Error(("Host path \'{}\' is"
diff --git a/cdist/test/__main__.py b/cdist/test/__main__.py
index c8c7df3b..08e839d1 100644
--- a/cdist/test/__main__.py
+++ b/cdist/test/__main__.py
@@ -45,5 +45,4 @@ for test_module in test_modules:
     suites.append(suite)
 
 all_suites = unittest.TestSuite(suites)
-rv = unittest.TextTestRunner(verbosity=2).run(all_suites).wasSuccessful()
-sys.exit(not rv)
+unittest.TextTestRunner(verbosity=2).run(all_suites)
diff --git a/cdist/test/cdist_type/__init__.py b/cdist/test/cdist_type/__init__.py
index a51a1e6f..ca961170 100644
--- a/cdist/test/cdist_type/__init__.py
+++ b/cdist/test/cdist_type/__init__.py
@@ -123,16 +123,6 @@ class TypeTestCase(test.CdistTestCase):
         cdist_type = core.CdistType(base_path, '__not_nonparallel')
         self.assertFalse(cdist_type.is_nonparallel)
 
-    def test_deprecated(self):
-        base_path = fixtures
-        cdist_type = core.CdistType(base_path, '__deprecated')
-        self.assertIsNotNone(cdist_type.deprecated)
-
-    def test_not_deprecated(self):
-        base_path = fixtures
-        cdist_type = core.CdistType(base_path, '__not_deprecated')
-        self.assertIsNone(cdist_type.deprecated)
-
     def test_install_is_install(self):
         base_path = fixtures
         cdist_type = core.CdistType(base_path, '__install')
@@ -200,18 +190,3 @@ class TypeTestCase(test.CdistTestCase):
         self.assertEqual(
             list(sorted(cdist_type.parameter_defaults.keys())),
             ['bar', 'foo'])
-
-    def test_without_deprecated_parameters(self):
-        base_path = fixtures
-        cdist_type = core.CdistType(base_path,
-                                    '__without_deprecated_parameters')
-        self.assertEqual(cdist_type.deprecated_parameters, {})
-
-    def test_with_deprecated_parameters(self):
-        base_path = fixtures
-        cdist_type = core.CdistType(base_path, '__with_deprecated_parameters')
-        self.assertTrue('eggs' in cdist_type.deprecated_parameters)
-        self.assertTrue('spam' in cdist_type.deprecated_parameters)
-        self.assertEqual(cdist_type.deprecated_parameters['eggs'],
-                         'Deprecated')
-        self.assertEqual(cdist_type.deprecated_parameters['spam'], '')
diff --git a/cdist/test/cdist_type/fixtures/__deprecated/deprecated b/cdist/test/cdist_type/fixtures/__deprecated/deprecated
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/test/cdist_type/fixtures/__with_deprecated_parameters/parameter/deprecated/eggs b/cdist/test/cdist_type/fixtures/__with_deprecated_parameters/parameter/deprecated/eggs
deleted file mode 100644
index 69d9f456..00000000
--- a/cdist/test/cdist_type/fixtures/__with_deprecated_parameters/parameter/deprecated/eggs
+++ /dev/null
@@ -1 +0,0 @@
-Deprecated
diff --git a/cdist/test/cdist_type/fixtures/__with_deprecated_parameters/parameter/deprecated/spam b/cdist/test/cdist_type/fixtures/__with_deprecated_parameters/parameter/deprecated/spam
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/test/cdist_type/fixtures/__with_deprecated_parameters/parameter/optional b/cdist/test/cdist_type/fixtures/__with_deprecated_parameters/parameter/optional
deleted file mode 100644
index bfe09199..00000000
--- a/cdist/test/cdist_type/fixtures/__with_deprecated_parameters/parameter/optional
+++ /dev/null
@@ -1,3 +0,0 @@
-spam
-eggs
-sausage
diff --git a/cdist/test/config/__init__.py b/cdist/test/config/__init__.py
index 499593e3..2b0d8b5f 100644
--- a/cdist/test/config/__init__.py
+++ b/cdist/test/config/__init__.py
@@ -23,6 +23,7 @@
 
 import os
 import shutil
+import tempfile
 
 from cdist import test
 from cdist import core
@@ -211,7 +212,7 @@ class ConfigRunTestCase(test.CdistTestCase):
         dryrun.run()
         # if we are here, dryrun works like expected
 
-    def test_deps_resolver(self):
+    def test_desp_resolver(self):
         """Test to show dependency resolver warning message."""
         local = cdist.exec.local.Local(
             target_host=self.target_host,
@@ -228,71 +229,6 @@ class ConfigRunTestCase(test.CdistTestCase):
         config = cdist.config.Config(local, self.remote, dry_run=True)
         config.run()
 
-    def test_graph_check_cycle_empty(self):
-        graph = {}
-        has_cycle, path = cdist.config.graph_check_cycle(graph)
-        self.assertFalse(has_cycle)
-
-    def test_graph_check_cycle_1(self):
-        #
-        # a -> b -> c
-        #      |
-        #      +--> d -> e
-        graph = {
-            'a': ['b', ],
-            'b': ['c', 'd', ],
-            'd': ['e', ],
-        }
-        has_cycle, path = cdist.config.graph_check_cycle(graph)
-        self.assertFalse(has_cycle)
-
-    def test_graph_check_cycle_2(self):
-        #
-        # a -> b -> c
-        # /\        |
-        #  \        |
-        #   +-------+
-        graph = {
-            'a': ['b', ],
-            'b': ['c', ],
-            'c': ['a', ],
-        }
-        has_cycle, path = cdist.config.graph_check_cycle(graph)
-        self.assertTrue(has_cycle)
-        self.assertGreater(path.count(path[-1]), 1)
-
-    def test_graph_check_cycle_3(self):
-        #
-        # a -> b -> c
-        #  \        \
-        #   \        +--> g
-        #    \            /\
-        #     \           /|
-        #      +-> d -> e  |
-        #           \      |
-        #            + --> f
-        #
-        # h -> i --> j
-        # |    /\    |
-        # \/    |    \/
-        # n     m <- k
-        graph = {
-            'a': ['b', 'd', ],
-            'b': ['c', ],
-            'c': ['g', ],
-            'd': ['e', 'f', ],
-            'e': ['g', ],
-            'f': ['g', ],
-            'h': ['i', 'n', ],
-            'i': ['j', ],
-            'j': ['k', ],
-            'k': ['m', ],
-            'm': ['i', ],
-        }
-        has_cycle, path = cdist.config.graph_check_cycle(graph)
-        self.assertTrue(has_cycle)
-        self.assertGreater(path.count(path[-1]), 1)
-
 
 # Currently the resolving code will simply detect that this object does
 # not exist. It should probably check if the type is a singleton as well
diff --git a/cdist/test/emulator/__init__.py b/cdist/test/emulator/__init__.py
index 5691093c..f94ce96d 100644
--- a/cdist/test/emulator/__init__.py
+++ b/cdist/test/emulator/__init__.py
@@ -420,27 +420,6 @@ class ArgumentsTestCase(test.CdistTestCase):
         self.assertEqual(cdist_object.parameters['required1'], value)
         self.assertEqual(cdist_object.parameters['required2'], value)
 
-    def test_required_multiple_arguments(self):
-        """check whether assigning required multiple parameter works"""
-
-        type_name = '__arguments_required_multiple'
-        object_id = 'some-id'
-        value1 = 'value1'
-        value2 = 'value2'
-        argv = [type_name, object_id, '--required1', value1,
-                '--required1', value2]
-        os.environ.update(self.env)
-        emu = emulator.Emulator(argv)
-        emu.run()
-
-        cdist_type = core.CdistType(self.local.type_path, type_name)
-        cdist_object = core.CdistObject(cdist_type, self.local.object_path,
-                                        self.local.object_marker_name,
-                                        object_id)
-        self.assertTrue('required1' in cdist_object.parameters)
-        self.assertTrue(value1 in cdist_object.parameters['required1'])
-        self.assertTrue(value2 in cdist_object.parameters['required1'])
-
 #    def test_required_missing(self):
 #        type_name = '__arguments_required'
 #        object_id = 'some-id'
@@ -468,25 +447,6 @@ class ArgumentsTestCase(test.CdistTestCase):
         self.assertFalse('optional2' in cdist_object.parameters)
         self.assertEqual(cdist_object.parameters['optional1'], value)
 
-    def test_optional_multiple(self):
-        type_name = '__arguments_optional_multiple'
-        object_id = 'some-id'
-        value1 = 'value1'
-        value2 = 'value2'
-        argv = [type_name, object_id, '--optional1', value1, '--optional1',
-                value2]
-        os.environ.update(self.env)
-        emu = emulator.Emulator(argv)
-        emu.run()
-
-        cdist_type = core.CdistType(self.local.type_path, type_name)
-        cdist_object = core.CdistObject(cdist_type, self.local.object_path,
-                                        self.local.object_marker_name,
-                                        object_id)
-        self.assertTrue('optional1' in cdist_object.parameters)
-        self.assertTrue(value1 in cdist_object.parameters['optional1'])
-        self.assertTrue(value2 in cdist_object.parameters['optional1'])
-
     def test_argument_defaults(self):
         type_name = '__argument_defaults'
         object_id = 'some-id'
@@ -504,29 +464,6 @@ class ArgumentsTestCase(test.CdistTestCase):
         self.assertFalse('optional2' in cdist_object.parameters)
         self.assertEqual(cdist_object.parameters['optional1'], value)
 
-    def test_object_params_in_context(self):
-        type_name = '__arguments_all'
-        object_id = 'some-id'
-        argv = [type_name, object_id, '--opt', 'opt', '--req', 'req',
-                '--bool', '--optmul', 'val1', '--optmul', 'val2',
-                '--reqmul', 'val3', '--reqmul', 'val4',
-                '--optmul1', 'val5', '--reqmul1', 'val6']
-        os.environ.update(self.env)
-        emu = emulator.Emulator(argv)
-        emu.run()
-
-        obj_params = emu._object_params_in_context()
-        obj_params_expected = {
-            'bool': '',
-            'opt': 'opt',
-            'optmul1': ['val5', ],
-            'optmul': ['val1', 'val2', ],
-            'req': 'req',
-            'reqmul1': ['val6', ],
-            'reqmul': ['val3', 'val4', ],
-        }
-        self.assertEqual(obj_params, obj_params_expected)
-
 
 class StdinTestCase(test.CdistTestCase):
 
diff --git a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/boolean b/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/boolean
deleted file mode 100644
index 46a27912..00000000
--- a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/boolean
+++ /dev/null
@@ -1 +0,0 @@
-bool
diff --git a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/optional b/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/optional
deleted file mode 100644
index d6eba11a..00000000
--- a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-opt
diff --git a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/optional_multiple b/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/optional_multiple
deleted file mode 100644
index 04893522..00000000
--- a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/optional_multiple
+++ /dev/null
@@ -1,2 +0,0 @@
-optmul
-optmul1
diff --git a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/required b/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/required
deleted file mode 100644
index da45f08d..00000000
--- a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-req
diff --git a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/required_multiple b/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/required_multiple
deleted file mode 100644
index 28c1a19b..00000000
--- a/cdist/test/emulator/fixtures/conf/type/__arguments_all/parameter/required_multiple
+++ /dev/null
@@ -1,2 +0,0 @@
-reqmul
-reqmul1
diff --git a/cdist/test/emulator/fixtures/conf/type/__arguments_optional_multiple/parameter/optional_multiple b/cdist/test/emulator/fixtures/conf/type/__arguments_optional_multiple/parameter/optional_multiple
deleted file mode 100644
index 31647628..00000000
--- a/cdist/test/emulator/fixtures/conf/type/__arguments_optional_multiple/parameter/optional_multiple
+++ /dev/null
@@ -1 +0,0 @@
-optional1
diff --git a/cdist/test/emulator/fixtures/conf/type/__arguments_required_multiple/parameter/required_multiple b/cdist/test/emulator/fixtures/conf/type/__arguments_required_multiple/parameter/required_multiple
deleted file mode 100644
index 180d60c7..00000000
--- a/cdist/test/emulator/fixtures/conf/type/__arguments_required_multiple/parameter/required_multiple
+++ /dev/null
@@ -1 +0,0 @@
-required1
diff --git a/cdist/test/exec/local.py b/cdist/test/exec/local.py
index 0865b7dc..0e0cc755 100644
--- a/cdist/test/exec/local.py
+++ b/cdist/test/exec/local.py
@@ -170,9 +170,6 @@ class LocalTestCase(test.CdistTestCase):
 
         os.environ['CDIST_PATH'] = conf_dir
 
-        # bypass singleton from other tests if any
-        cc.Configuration.instance = None
-
         configuration = cc.Configuration(argparse.Namespace(),
                                          env=os.environ)
 
diff --git a/cdist/test/inventory/__init__.py b/cdist/test/inventory/__init__.py
index 287c855c..4c0dd936 100644
--- a/cdist/test/inventory/__init__.py
+++ b/cdist/test/inventory/__init__.py
@@ -472,6 +472,5 @@ class InventoryTestCase(test.CdistTestCase):
             self.assertEqual(htags, ())
         os.remove(hostfile)
 
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/cdist/util/fsproperty.py b/cdist/util/fsproperty.py
index 5a27c9d7..e458fd9e 100644
--- a/cdist/util/fsproperty.py
+++ b/cdist/util/fsproperty.py
@@ -58,7 +58,7 @@ class FileList(collections.MutableSequence):
             with open(self.path) as fd:
                 for line in fd:
                     lines.append(line.rstrip('\n'))
-        except EnvironmentError:
+        except EnvironmentError as e:
             # error ignored
             pass
         return lines
@@ -127,16 +127,7 @@ class DirectoryDict(collections.MutableMapping):
     def __getitem__(self, key):
         try:
             with open(os.path.join(self.path, key), "r") as fd:
-                value = fd.read().splitlines()
-                # if there is no value/empty line then return ''
-                # if there is only one value then return that value
-                # if there are multiple lines in file then return list
-                if not value:
-                    return ''
-                elif len(value) == 1:
-                    return value[0]
-                else:
-                    return value
+                return fd.read().rstrip('\n')
         except EnvironmentError:
             raise KeyError(key)
 
diff --git a/docs/changelog b/docs/changelog
index 7594a6d4..8fd2ea49 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -1,138 +1,9 @@
 Changelog
 ---------
 
-5.1.3: 2019-08-30
-	* Build: Overcome bash CDPATH when building docs (Dmitry Bogatov)
-	* Type __grafana_dashboard: Update distribution name, package signing key URI and repository URI (Dominique Roux)
-	* Type __letsencrypt_cert: Add Devuan Beowulf support (Nico Schottelius)
-	* Type __letsencrypt_cert: Fix Devuan Ascii: support (Nico Schottelius)
-	* Type __docker: Add devuan support (Dominique Roux)
-	* Type __docker_swarm: Fix for Docker 19.03 (Ľubomír Kučera)
-
-5.1.2: 2019-06-21
-	* Core: Add support for type parameters deprecation (Darko Poljak)
-	* Type __acl: Rewrite and improve (Ander Punnar)
-
-5.1.1: 2019-05-28
-	* Type __apt_key: Use gpg key, fallback to deprecated apt-key (Ander Punnar)
-	* Type __acl: Fix and improve (Ander Punnar)
-	* Documentation: Document type stdin inside loop caveats (Darko Poljak)
-
-5.1.0: 2019-05-22
-	* Type __consul: Add alpine support (Nico Schottelius)
-	* Type __consul: Add version 1.5.0 (Nico Schottelius)
-	* Type __consul_agent: Add alpine support (Nico Schottelius)
-	* New helper script: cdist-new-type (Steven Armstrong, Darko Poljak)
-	* Core: Add support for deprecated type marker (Darko Poljak)
-
-5.0.2: 2019-05-17
-	* Type __package_apk: Fix @repo handling in explorer (Nico Schottelius)
-	* Type __postfix: Add alpine support (Nico Schottelius)
-	* Type __postfix_postconf: Add alpine support (Nico Schottelius)
-	* Type __user: Add alpine support (Nico Schottelius)
-	* Core: Set __cdist_dry_run env var (Ander Punnar)
-
-5.0.1: 2019-05-09
-	* Documentation: Add 'Perils of CDIST_ORDER_DEPENDENCY' sub-section (Darko Poljak)
-	* Build: Clean and separate end user targets into Makefile and maintainer targets into build-helper (Darko Poljak)
-	* Core: Update residual references to old cdist homepage (Darko Poljak)
-	* Documentation: Update residual references to old cdist homepage and git source (Darko Poljak)
-	* Type __cdist: Fix non working 'git://' protocol source (Darko Poljak)
-
-5.0.0: 2019-05-05
-	* Type __zypper_service: Fix spelling error in manpage (Dmitry Bogatov)
-	* Explorer init: Add support for OpenBSD (sideeffect42)
-	* Type __postgres_database: Run psql with -w (no-password) (sideeffect42)
-	* Type __postgres_role: Run psql with -w (no-password) (sideeffect42)
-	* Type __block: Quote prefix/suffix - fix when prefix/suffix contains quotes (sideeffect42)
-	* Build: Update due to migration to code.ungleich.ch (Darko Poljak)
-	* Documentation: Update due to migration to code.ungleich.ch (Darko Poljak)
-	* Core: Detect and report dependency cycle as soon as possible (Darko Poljak)
-	* Core, documentation: Release -j/--jobs option, i.e. make it non-beta (Darko Poljak)
-	* Documentation: Update due to new cdist website (Darko Poljak)
-	* Build: Update due to new cdist website (Darko Poljak)
-
-4.11.1: 2019-04-22
-	* Core: Improve explorer error reporting (Darko Poljak)
-	* Type __directory: explorer stat: add support for Solaris (Ander Punnar)
-	* Type __file: explorer stat: add support for Solaris (Ander Punnar)
-	* Type __ssh_authorized_keys: Remove legacy code (Ander Punnar)
-	* Explorer disks: Bugfix: do not break config in case of unsupported OS
-	  which was introduced in 4.11.0, print message to stderr and empty disk list
-	  to stdout instead (Darko Poljak)
-
-4.11.0: 2019-04-20
-	* Type __package: Add __package_apk support (Nico Schottelius)
-	* Type __directory: Add alpine support (Nico Schottelius)
-	* Type __file: Add alpine support (Nico Schottelius)
-	* Type __hostname: Add alpine support (Nico Schottelius)
-	* Type __locale: Add alpine support (Nico Schottelius)
-	* Type __start_on_boot: Add alpine support (Nico Schottelius)
-	* Type __timezone: Add alpine support (Nico Schottelius)
-	* Type __start_on_boot: gentoo: check all runlevels in explorer (Nico Schottelius)
-	* New type: __package_apk (Nico Schottelius)
-	* Type __acl: Add support for ACL mask (Dimitrios Apostolou)
-	* Core: Fix circular dependency for CDIST_ORDER_DEPENDENCY (Darko Poljak)
-	* Type __acl: Improve the type (Ander Punnar)
-	* Explorer interfaces: Simplify code, be more compatible (Ander Punnar)
-	* Explorer disks: Remove assumable default/fallback, for now explicitly support only Linux and BSDs (Ander Punnar, Darko Poljak)
-
-4.10.11: 2019-04-13
-	* Core: Fix broken quiet mode (Darko Poljak)
-	* Build: Add version.py into generated raw source archive (Darko Poljak)
-	* Explorer disks: Fix detecting disks, fix/add support for BSDs (Ander Punnar)
-	* Type __file: Fix stat explorer for BSDs (Ander Punnar)
-	* Type __directory: Fix stat explorer for BSDs (Ander Punnar)
-
-4.10.10: 2019-04-11
-	* New types: __ufw and __ufw_rule (Mark Polyakov)
-	* Type __link: Add messaging (Ander Punnar)
-	* Debugging: Rename debug-dump.sh to cdist-dump (Darko Poljak)
-	* Documentation: Add cdist-dump man page (Darko Poljak)
-
-4.10.9: 2019-04-09
-	* Type __ssh_authorized_keys: Properly handle multiple --option params (Steven Armstrong)
-	* Debugging: Add debug dump helper script (Darko Poljak)
-	* Type __file: Bugfix: fire onchange for present and exists states if no attribute is changed (Darko Poljak)
-
-4.10.8: 2019-04-06
-	* Type __clean_path: Fix list explorer exit code if path not directory or does not exist (Ander Punnar)
-	* New type: __check_messages (Ander Punnar)
-
-4.10.7: 2019-03-30
-	* Build: Migrate from pep8 to pycodestyle (Darko Poljak)
-	* Type __start_on_boot: Implement state absent for OpenBSD (Daniel Néri)
-	* Explorers cpu_cores, disks: Add support for OpenBSD (Daniel Néri)
-	* Type __staged_file: Use portable -p instead of --tmpdir for mktemp (Silas Silva)
-	* Type __line: Add onchange parameter (Ander Punnar)
-	* Type __file: Add onchange parameter (Ander Punnar)
-	* New type: __clean_path (Ander Punnar)
-
-4.10.6: 2019-02-15
-	* Type __prometheus_alertmanager: Add startup flag (Dominique Roux)
-	* Types __zypper_repo, __zypper_service: Re-add the use of echo in explorers (Daniel Heule)
-
-4.10.5: 2018-12-21
-	* Type __group: Fix/remove '--' from echo command (Dimitrios Apostolou)
-	* New type: __ping (Olliver Schinagl)
-	* Type __postgres_role: Fix broken syntax (Nico Schottelius, Darko Poljak)
-	* Type __consul_agent: Add Debian 9 support (Jin-Guk Kwon)
-	* Documentation: Fix broken links (Rage <OxR463>)
-	* Type __docker: Add version parameter (Jonas Weber)
-	* Type __sysctl: Refactor for better OS support (Takashi Yoshi)
-	* Types __package_*: Add messaging upon installation/removal (Takashi Yoshi)
-	* Type __package_pkg_openbsd: Reworked (Takashi Yoshi)
-
-4.10.4: 2018-11-03
+next:
 	* Core: Transfer all files of a directory at once instead of calling copy once per file (myeisha)
 	* Core: Add timestamp (optional) to log messages (Darko Poljak)
-	* Explorers and types: Fix shellcheck found problems and encountered bugs (Jonas Weber, Thomas Eckert, Darko Poljak)
-	* Build: Add shellcheck makefile target and check when doing release (Darko Poljak)
-	* Type __consul: Add newest versions (Dominique Roux)
-	* Type __user: Remove annoying output, handle state param gracefully, add messages for removal (Thomas Eckert)
-	* Core: Fix checking for conflicting parameters for multiple values parameters (Darko Poljak)
-	* Documentation: Various fixes (Thomas Eckert)
-	* Various types: Improve OpenBSD support (sideeffect42)
 
 4.10.3: 2018-09-23
 	* New global explorer: os_release (Ľubomír Kučera)
diff --git a/docs/dev/github-gitlab-migration/release b/docs/dev/github-gitlab-migration/release
deleted file mode 100755
index c973f0f1..00000000
--- a/docs/dev/github-gitlab-migration/release
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh -e
-
-set -x
-
-printf "Enter tag name: "
-read tag
-printf "Enter repository authentication token: "
-read token
-
-git tag -d "${tag}" || :
-
-git tag "${tag}" -m "Release ${tag}"
-git push origin "${tag}"
-
-echo 'foo' > foo
-echo 'foo signature' > foo.asc
-
-archivename="foo"
-
-project="poljakowski%2Fmy-cdist-testing"
-sed_cmd='s/^.*"markdown":"\([^"]*\)".*$/\1/'
-
-# upload archive
-response_archive=$(curl -f -X POST \
-     -H "PRIVATE-TOKEN: ${token}" \
-     -F "file=@${archivename}" \
-     "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
-     | sed "${sed_cmd}") || exit 1
-
-# upload archive signature
-response_archive_sig=$(curl -f -X POST \
-     -H "PRIVATE-TOKEN: ${token}" \
-     -F "file=@${archivename}.asc" \
-    "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
-     | sed "${sed_cmd}") || exit 1
-
-# make release
-curl -f -X POST \
-     -H "PRIVATE-TOKEN: ${token}" \
-     -F "description=Release ${tag}<br/>${response_archive}<br/>${response_archive_sig}" \
-    "https://code.ungleich.ch/api/v4/projects/${project}/repository/tags/${tag}/release" \
-    || exit 1
-
-# get tag
-curl -f -X GET \
-     -H "PRIVATE-TOKEN: ${token}" \
-    "https://code.ungleich.ch/api/v4/projects/${project}/repository/tags/${tag}" \
-    || exit 1
-
-rm -f foo foo.asc
diff --git a/docs/src/_static/cdist-logo.jpeg b/docs/src/_static/cdist-logo.jpeg
deleted file mode 100644
index 9bfa2529..00000000
Binary files a/docs/src/_static/cdist-logo.jpeg and /dev/null differ
diff --git a/docs/src/cdist-best-practice.rst b/docs/src/cdist-best-practice.rst
index a91f2cc0..45aba11b 100644
--- a/docs/src/cdist-best-practice.rst
+++ b/docs/src/cdist-best-practice.rst
@@ -13,18 +13,15 @@ See sshd_config(5) and ssh-keygen(1).
 Speeding up ssh connections
 ---------------------------
 When connecting to a new host, the initial delay with ssh connections
-is pretty big. As cdist makes many connections to each host successive
-connections can be sped up by "sharing of multiple sessions over a single
-network connection" (quote from ssh_config(5)). This is also called "connection
-multiplexing".
+is pretty big. You can work around this by
+"sharing of multiple sessions over a single network connection"
+(quote from ssh_config(5)). The following code is suitable for
+inclusion into your ~/.ssh/config::
 
-Cdist implements this since v4.0.0 by executing ssh with the appropriate
-options (`-o ControlMaster=auto  -o ControlPath=/tmp/<tmpdir>/s  -o
-ControlPersist=2h`).
-
-Note that the sshd_config on the server can configure the maximum number of
-parallel multiplexed connections this with `MaxSessions N` (N defaults to 10
-for OpenSSH v7.4).
+    Host *
+      ControlPath ~/.ssh/master-%l-%r@%h:%p
+      ControlMaster auto
+      ControlPersist 10
 
 
 Speeding up shell execution
@@ -224,140 +221,3 @@ in the repository for such content: It allows you to
 easily distinguish what is used by cdist and what is not
 and also to store all important files in one
 repository.
-
-
-Perils of CDIST_ORDER_DEPENDENCY
---------------------------------
-With CDIST_ORDER_DEPENDENCY all types are executed in the order in which they
-are created in the manifest. The current created object automatically depends
-on the previously created object.
-
-It essentially helps you to build up blocks of code that build upon each other
-(like first creating the directory xyz than the file below the directory).
-
-This can be helpful, but it can also be the source of *evil*.
-
-
-CDIST_ORDER_DEPENDENCY easily causes unobvious dependency cycles
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Let's see an example. Suppose you have special init manifest where among other
-things you are assuring that remote host has packages `sudo` and `curl`
-installed.
-
-**init1**
-
-.. code-block:: sh
-
-   CDIST_ORDER_DEPENDENCY=1
-   export CDIST_ORDER_DEPENDENCY
-
-   for p in sudo curl
-   do
-      __package "${p}"
-   done
-
-Then you have some other special init manifest where among other things you are
-assuring `sudo` package is installed.
-
-**init2**
-
-.. code-block:: sh
-
-   CDIST_ORDER_DEPENDENCY=1
-   export CDIST_ORDER_DEPENDENCY
-
-   __package sudo
-
-Then you have third init manifest where you combine those two init manifests,
-by including them:
-
-**init**
-
-.. code-block:: sh
-
-   sh -e "$__manifest/init1"
-   sh -e "$__manifest/init2"
-
-The resulting init manifest is then equal to:
-
-.. code-block:: sh
-
-   CDIST_ORDER_DEPENDENCY=1
-   export CDIST_ORDER_DEPENDENCY
-
-   for p in sudo curl
-   do
-      __package "${p}"
-   done
-
-   CDIST_ORDER_DEPENDENCY=1
-   export CDIST_ORDER_DEPENDENCY
-
-   __package sudo
-
-In the end you get the following dependencies:
-
-* `__package/curl` depends on `__package/sudo`
-* `__package/sudo` depends on `__package/curl`
-
-And here you have a circular dependency!
-
-In the real world manifest can be quite complex, dependencies can become
-complicated and circual dependencies are not so obvious. Resolving it can
-become cumbersome.
-
-**Practical solution?**
-
-Instead of managing complex init manifests you can write custom types.
-Each custom type can do one thing, it has well defined dependencies that will
-not leak into init manifest. In custom type you can also add special explorers
-and gencode.
-
-Then, in init manifest you combine your complex types. It is:  
-
-* cleaner
-* easier to follow
-* easier to maintain
-* easier to debug.
-
-
-CDIST_ORDER_DEPENDENCY kills parallelization
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Suppose you have defined CDIST_ORDER_DEPENDENCY and then, among other things,
-you specify creation of three, by nature independent, files.
-
-**init**
-
-.. code-block:: sh
-
-   CDIST_ORDER_DEPENDENCY=1
-   export CDIST_ORDER_DEPENDENCY
-
-   ...
-   __file /tmp/file1
-   __file /tmp/file2
-   __file /tmp/file3
-   ...
-
-Due to defined CDIST_ORDER_DEPENDENCY cdist will execute them in specified order.
-It is better to use CDIST_ORDER_DEPENDENCY in well defined blocks:
-
-**init**
-
-.. code-block:: sh
-
-   CDIST_ORDER_DEPENDENCY=1
-   export CDIST_ORDER_DEPENDENCY
-   ...
-   unset CDIST_ORDER_DEPENDENCY
-
-   __file /tmp/file1
-   __file /tmp/file2
-   __file /tmp/file3
-
-   CDIST_ORDER_DEPENDENCY=1
-   export CDIST_ORDER_DEPENDENCY
-   ...
-   unset CDIST_ORDER_DEPENDENCY
diff --git a/docs/src/cdist-hacker.rst b/docs/src/cdist-hacker.rst
index e4252e19..ea5dceb3 100644
--- a/docs/src/cdist-hacker.rst
+++ b/docs/src/cdist-hacker.rst
@@ -16,7 +16,7 @@ Reporting bugs
 --------------
 If you believe you've found a bug and verified that it is
 in the latest version, drop a mail to the cdist mailing list,
-subject prefixed with "[BUG] " or create an issue on code.ungleich.ch.
+subject prefixed with "[BUG] " or create an issue on github.
 
 
 Coding conventions (everywhere)
@@ -51,7 +51,7 @@ work nor kill the authors brain:
 
 As soon as your work meets these requirements, write a mail
 for inclusion to the mailinglist **cdist-configuration-management at googlegroups.com**
-or open a merge request at https://code.ungleich.ch/ungleich-public/cdist.
+or open a pull request at http://github.com/ungleich/cdist.
 
 
 How to submit a new type
@@ -59,9 +59,10 @@ How to submit a new type
 For detailed information about types, see `cdist type <cdist-type.html>`_.
 
 Submitting a type works as described above, with the additional requirement
-that a corresponding manpage named man.rst in ReSTructured text format with
+that a corresponding manpage named man.text in asciidoc format with
 the manpage-name "cdist-type__NAME" is included in the type directory
-AND the manpage builds (`make man`).
+AND asciidoc is able to compile it (i.e. do NOT have to many "=" in the second
+line).
 
 Warning: Submitting "exec" or "run" types that simply echo their parameter in
 **gencode** will not be accepted, because they are of no use. Every type can output
@@ -76,7 +77,7 @@ The following workflow works fine for most developers
 .. code-block:: sh
 
     # get latest upstream master branch
-    git clone https://code.ungleich.ch/ungleich-public/cdist.git
+    git clone https://github.com/ungleich/cdist.git
 
     # update if already existing
     cd cdist; git fetch -v; git merge origin/master
@@ -88,22 +89,22 @@ The following workflow works fine for most developers
     # *hack*
     *hack*
 
-    # clone the cdist repository on code.ungleich.ch if you haven't done so
+    # clone the cdist repository on github if you haven't done so
 
     # configure your repo to know about your clone (only once)
-    git remote add ungleich git@code.ungleich.ch:YOURUSERNAME/cdist.git
+    git remote add github git@github.com:YOURUSERNAME/cdist.git
 
-    # push the new branch to ungleich gitlab
-    git push ungleich documentation_cleanup
+    # push the new branch to github 
+    git push github documentation_cleanup
 
     # (or everything)
-    git push --mirror ungleich
+    git push --mirror github
 
-    # create a merge request at ungleich gitlab (use a browser)
+    # create a pull request at github (use a browser)
     # *fixthingsbecausequalityassurancefoundissuesinourpatch*
     *hack*
 
-    # push code to ungleich gitlab again
+    # push code to github again
     git push ... # like above
 
     # add comment that everything should be green now (use a browser)
diff --git a/docs/src/cdist-install.rst b/docs/src/cdist-install.rst
index a9b7d6b5..afc50016 100644
--- a/docs/src/cdist-install.rst
+++ b/docs/src/cdist-install.rst
@@ -36,43 +36,23 @@ To install cdist, execute the following commands:
 
 .. code-block:: sh
 
-    git clone https://code.ungleich.ch/ungleich-public/cdist.git
+    git clone https://github.com/ungleich/cdist.git
     cd cdist
     export PATH=$PATH:$(pwd -P)/bin
 
-From version 4.2.0 cdist tags and releases are signed.
-You can get GPG public key used for signing `here <_static/pgp-key-EFD2AE4EC36B6901.asc>`_.
-
-You can also get cdist from `github mirror <https://github.com/ungleich/cdist>`_.
-
 To install cdist with distutils from cloned repository, first you have to
 create version.py:
 
 .. code-block:: sh
 
-    ./bin/build-helper version
+    make version
 
-Then you install it with:
-
-.. code-block:: sh
-
-   make install
-
-or with:
-
-.. code-block:: sh
-
-   make install-user
-
-to install it into user *site-packages* directory.
-Or directly with distutils:
+Then, as usual, you execute the following command:
 
 .. code-block:: sh
 
     python setup.py install
 
-Note that `bin/build-helper` script is intended for cdist maintainers.
-
 
 Available versions in git
 ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -94,6 +74,14 @@ So for instance if you want to use and stay with version 4.1, you can use
 
     git checkout -b 4.1 origin/4.1
 
+Git mirrors
+^^^^^^^^^^^
+
+If the main site is down, you can acquire cdist from one of the following sites:
+
+ * git://github.com/telmich/cdist.git `github <https://github.com/telmich/cdist>`_
+ * git://git.code.sf.net/p/cdist/code `sourceforge <https://sourceforge.net/p/cdist/code>`_
+
 Building and using documentation (man and html)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/docs/src/cdist-intro.rst b/docs/src/cdist-intro.rst
new file mode 100644
index 00000000..fad40fe5
--- /dev/null
+++ b/docs/src/cdist-intro.rst
@@ -0,0 +1,15 @@
+cdist - usable configuration management
+=======================================
+
+.. image:: cdist-logo.png
+    :alt: cdist-logo
+
+cdist is a usable configuration management system.
+It adheres to the KISS principle and 
+is being used in small up to enterprise grade environments.
+cdist is an alternative to other configuration management systems like
+
+* `bcfg2 <http://trac.mcs.anl.gov/projects/bcfg2>`_
+* `chef <http://wiki.opscode.com/display/chef/>`_
+* `cfengine <http://www.cfengine.org/>`_
+* `puppet <http://www.puppetlabs.com/>`_.
diff --git a/docs/src/_static/cdist-logo.png b/docs/src/cdist-logo.png
similarity index 100%
rename from docs/src/_static/cdist-logo.png
rename to docs/src/cdist-logo.png
diff --git a/docs/src/cdist-manifest.rst b/docs/src/cdist-manifest.rst
index 4dd3e74b..0e266943 100644
--- a/docs/src/cdist-manifest.rst
+++ b/docs/src/cdist-manifest.rst
@@ -163,8 +163,6 @@ automatically depends on the previously created object.
 It essentially helps you to build up blocks of code that build upon each other
 (like first creating the directory xyz than the file below the directory).
 
-Read also about `perils of CDIST_ORDER_DEPENDENCY <cdist-best-practice.html#perils-of-cdist-order-dependency>`_.
-
 
 Overrides
 ---------
diff --git a/docs/src/cdist-os.rst b/docs/src/cdist-os.rst
index a8e31226..4f6b4820 100644
--- a/docs/src/cdist-os.rst
+++ b/docs/src/cdist-os.rst
@@ -1,19 +1,16 @@
-Supported operating systems
+Supported Operating Systems
 ===========================
 
 cdist was tested or is know to run on at least
 
-* `Alpine Linux <https://alpinelinux.org>`_
-* `Archlinux <http://www.archlinux.org>`_
-* `CentOS <http://www.centos.org>`_
-* `Debian <http://www.debian.org>`_
-* `Devuan <https://devuan.org>`_
-* `Fedora <http://fedoraproject.org>`_
+* `Archlinux <http://www.archlinux.org/>`_
+* `Debian <http://www.debian.org/>`_
+* `CentOS <http://www.centos.org/>`_
+* `Fedora <http://fedoraproject.org/>`_
 * `FreeBSD <http://www.freebsd.org>`_
-* `Gentoo <http://www.gentoo.org>`_
-* `Mac OS X <http://www.apple.com/macosx>`_
-* `NetBSD <https://www.netbsd.org>`_
+* `Gentoo <http://www.gentoo.org/>`_
+* `Mac OS X <http://www.apple.com/macosx/>`_
 * `OpenBSD <http://www.openbsd.org>`_
-* `Redhat <http://www.redhat.com>`_
-* `Ubuntu <http://www.ubuntu.com>`_
-* `XenServer <http://www.citrix.com/xenserver>`_
+* `Redhat <http://www.redhat.com/>`_
+* `Ubuntu <http://www.ubuntu.com/>`_
+* `XenServer <http://www.citrix.com/xenserver/>`_
diff --git a/docs/src/cdist-parallelization.rst b/docs/src/cdist-parallelization.rst
index d458a128..ed3afae9 100644
--- a/docs/src/cdist-parallelization.rst
+++ b/docs/src/cdist-parallelization.rst
@@ -12,7 +12,8 @@ The other way is to operate in parallel within one host where you specify
 the number of jobs. This is enabled with :strong:`-j/--jobs` option where you
 can specify the number of parallel jobs. By default,
 :strong:`multiprocessing.cpu_count()` is used. For this mode global explorers,
-object preparation and object run are supported.
+object preparation and object run are supported and this option is still in
+:strong:`beta`.
 
 You can, of course, use those two options together. This means that each host
 will be processed by its own process. Within each process cdist will operate
@@ -31,11 +32,11 @@ Examples
 
     # Configure hosts read from file hosts.file sequentially but using default
     # number of parallel jobs
-    $ cdist config -j -f hosts.file
+    $ cdist config -b -j -f hosts.file
 
     # Configure hosts read from file hosts.file in parallel using 16
     # parallel jobs
-    $ cdist config -j 16 -p -f hosts.file
+    $ cdist config -b -j 16 -p -f hosts.file
 
 
 Caveats
diff --git a/docs/src/cdist-quickstart.rst b/docs/src/cdist-quickstart.rst
index 99af869f..0020568d 100644
--- a/docs/src/cdist-quickstart.rst
+++ b/docs/src/cdist-quickstart.rst
@@ -54,7 +54,9 @@ we can use cdist to configure it. You can copy and paste the following
 code into your shell to get started and configure localhost::
 
     # Get cdist 
-    git clone git@code.ungleich.ch:ungleich-public/cdist.git
+    # Mirrors can be found on
+    # http://www.nico.schottelius.org/software/cdist/install/#index2h4
+    git clone git://github.com/ungleich/cdist
 
     # Create manifest (maps configuration to host(s)
     cd cdist
diff --git a/docs/src/cdist-reference.rst.sh b/docs/src/cdist-reference.rst.sh
index f4a37816..59ce018b 100755
--- a/docs/src/cdist-reference.rst.sh
+++ b/docs/src/cdist-reference.rst.sh
@@ -219,10 +219,6 @@ __cdist_log_level, __cdist_log_level_name
     | TRACE          | 5               |
     +----------------+-----------------+
 
-    Available for: initial manifest, explorer, type manifest, type explorer,
-    type gencode.
-__cdist_dry_run
-    Is set only when doing dry run (``-n`` flag).
     Available for: initial manifest, explorer, type manifest, type explorer,
     type gencode.
 __explorer
@@ -327,7 +323,6 @@ CDIST_OVERRIDE
 
 CDIST_ORDER_DEPENDENCY
     Create dependencies based on the execution order (see  \`cdist manifest <cdist-manifest.html>\`_).
-    Read also about \`perils of CDIST_ORDER_DEPENDENCY <cdist-best-practice.html#perils-of-cdist-order-dependency>\`_.
 
 CDIST_REMOTE_EXEC
     Use this command for remote execution (should behave like ssh).
diff --git a/docs/src/cdist-support.rst b/docs/src/cdist-support.rst
index 19afde2f..2343500e 100644
--- a/docs/src/cdist-support.rst
+++ b/docs/src/cdist-support.rst
@@ -1,9 +1,11 @@
 Support
 -------
 
-Chat
-~~~~
-Chat with us: `ungleich chat <https://chat.ungleich.ch/ungleich/channels/cdist>`_.
+IRC
+~~~
+
+You can join the development ***IRC channel***
+`#cstar on irc.freenode.net <irc://irc.freenode.org/#cstar>`_.
 
 Mailing list
 ~~~~~~~~~~~~
@@ -23,4 +25,4 @@ Commercial support
 ~~~~~~~~~~~~~~~~~~
 
 You can request commercial support for cdist from
-`ungleich <http://www.ungleich.ch/>`_.
+`my company <http://www.ungleich.ch/>`_.
diff --git a/docs/src/cdist-troubleshooting.rst b/docs/src/cdist-troubleshooting.rst
index e639aafd..b016e845 100644
--- a/docs/src/cdist-troubleshooting.rst
+++ b/docs/src/cdist-troubleshooting.rst
@@ -43,22 +43,3 @@ you write to use the -e flag:
     % cat ~/.cdist/manifest/special
     #!/bin/sh -e
     ...
-
-Using debug dump helper script
-------------------------------
-Since cdist stores data to local cache that can be used for debugging there
-is a helper script that dumps data from local cache,
-`cdist-dump <man1/cdist-dump.html>`_.
-
-For more info see:
-
-.. code-block:: sh
-
-    cdist-dump -h
-
-Or from cdist git cloned directory:
-
-.. code-block:: sh
-
-    ./scripts/cdist-dump -h
-
diff --git a/docs/src/cdist-type.rst b/docs/src/cdist-type.rst
index 582c0938..7c0dab8d 100644
--- a/docs/src/cdist-type.rst
+++ b/docs/src/cdist-type.rst
@@ -71,31 +71,6 @@ when using -j option. Example of such a type is __package_dpkg type where dpkg i
 prevents to be run in more than one instance.
 
 
-Deprecated types
------------------
-If a type is flagged with 'deprecated' marker then it is considered deprecated.
-When it is used cdist writes warning line. If 'deprecated' marker has content
-then this content is printed as a deprecation messages, e.g.:
-
-.. code-block:: sh
-
-    $ ls -l deprecated 
-    -rw-r--r--  1 darko  darko  71 May 20 18:30 deprecated
-    $ cat deprecated 
-    This type is deprecated. It will be removed in the next minor release.
-    $ echo '__foo foo' | ./bin/cdist config -i - 185.203.112.26
-    WARNING: 185.203.112.26: Type __foo is deprecated: This type is deprecated. It will be removed in the next minor release.
-
-If 'deprecated' marker has no content then general message is printed, e.g.:
-
-.. code-block:: sh
-
-    $ ls -l deprecated 
-    -rw-r--r--  1 darko  darko  0 May 20 18:36 deprecated
-    $ echo '__bar foo' | ./bin/cdist config -i - 185.203.112.26
-    WARNING: 185.203.112.26: Type __bar is deprecated.
-
-
 How to write a new type
 -----------------------
 A type consists of
@@ -118,9 +93,6 @@ they are written in shell so they are executed using '/bin/sh -e' or 'CDIST_LOCA
 
 For executable shell code it is suggested that shebang is '#!/bin/sh -e'.
 
-For creating type skeleton you can use helper script
-`cdist-new-type <man1/cdist-new-type.html>`_.
-
 
 Defining parameters
 -------------------
@@ -186,31 +158,6 @@ Example: (e.g. in cdist/conf/type/__nginx_vhost/manifest)
     fi
 
 
-Deprecated parameters
----------------------
-To deprecate type parameters one can declare a file for each deprecated
-parameter under **parameter/deprecated** directory.
-
-When such parameter is used cdist writes warning line with deprecation message.
-If such file has content then this content is printed as deprecation message.
-If there is no content then generic parameter deprecation message is printed.
-
-Example:
-
-.. code-block:: sh
-
-    $ ls parameter/deprecated/
-    eggs    spam
-    $ cat parameter/deprecated/eggs
-    eggs parameter is deprecated, please use multiple egg parameter.
-    $ cat parameter/deprecated/spam
-    $ echo '__foo foo --foo foo --eggs eggs' | ./bin/cdist config -i - 185.203.112.26
-    WARNING: 185.203.112.26: eggs parameter of type __foo is deprecated: eggs parameter is deprecated, please use multiple egg parameter.
-    $ echo '__foo foo --foo foo --eggs eggs --spam spam' | ./bin/cdist config -i - 185.203.112.26
-    WARNING: 185.203.112.26: spam parameter of type __foo is deprecated.
-    WARNING: 185.203.112.26: eggs parameter of type __foo is deprecated: eggs parameter is deprecated, please use multiple egg parameter.
-
-
 Input from stdin
 ----------------
 Every type can access what has been written on stdin when it has been called.
@@ -241,73 +188,6 @@ In the __file type, stdin is used as source for the file, if - is used for sourc
     ....
 
 
-Stdin inside a loop
-~~~~~~~~~~~~~~~~~~~
-Since cdist saves type's stdin content in the object as **$__object/stdin**,
-so it can be accessed in manifest and gencode-* scripts, this can lead to
-unexpected behavior. For example, suppose you have some type with the following
-in its manifest:
-
-.. code-block:: sh
-
-    if [ -f "$__object/parameter/foo" ]
-    then
-        while read -r l
-        do
-            __file "$l"
-            echo "$l" >&2
-        done < "$__object/parameter/foo"
-    fi
-
-and init manifest:
-
-.. code-block:: sh
-
-    __foo foo --foo a --foo b --foo c
-
-You expect that manifest stderr content is:
-
-.. code-block:: sh
-
-    a
-    b
-    c
-
-and that files *a*, *b* and *c* are created. But all you get in manifest stderr
-is:
-
-.. code-block:: sh
-
-    a
-
-and only *a* file is created.
-
-When redirecting parameter *foo* file content to while's stdin that means that all
-commands in while body have this same stdin. So when *__file* type gets executed,
-cdist saves its stdin which means it gets the remaining content of parameter *foo*
-file, i.e.:
-
-.. code-block:: sh
-
-    b
-    c
-
-The solution is to make sure that your types inside such loops get their stdin
-from somewhere else, e.g. for the above problem *__file* type can get empty
-stdin from */dev/null*:
-
-.. code-block:: sh
-
-    if [ -f "$__object/parameter/foo" ]
-    then
-        while read -r l
-        do
-            __file "$l" < /dev/null
-            echo "$l" >&2
-        done < "$__object/parameter/foo"
-    fi
-
-
 Writing the manifest
 --------------------
 In the manifest of a type you can use other types, so your type extends
@@ -491,15 +371,6 @@ It is available for initial manifest, explorer, type manifest,
 type explorer, type gencode.
 
 
-Detecting dry run
------------------
-
-If ``$__cdist_dry_run`` environment variable is set, then it's dry run.
-
-It is available for initial manifest, explorer, type manifest,
-type explorer, type gencode.
-
-
 Hints for typewriters
 ----------------------
 It must be assumed that the target is pretty dumb and thus does not have high
diff --git a/docs/src/cdist-upgrade.rst b/docs/src/cdist-update.rst
similarity index 99%
rename from docs/src/cdist-upgrade.rst
rename to docs/src/cdist-update.rst
index e57ed63c..e810d6e9 100644
--- a/docs/src/cdist-upgrade.rst
+++ b/docs/src/cdist-update.rst
@@ -1,5 +1,5 @@
-How to upgrade cdist
-====================
+How to update cdist
+===================
 
 Update the git installation
 ---------------------------
diff --git a/docs/src/conf.py b/docs/src/conf.py
index 78f9842c..8ed48324 100644
--- a/docs/src/conf.py
+++ b/docs/src/conf.py
@@ -56,7 +56,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'cdist'
-copyright = 'ungleich GmbH 2019'
+# copyright = '2016, Darko Poljak'
 # author = 'Darko Poljak'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -138,7 +138,7 @@ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = '_static/cdist-logo.jpeg'
+# html_logo = None
 
 # The name of an image file (relative to this directory) to use as a favicon of
 # the docs.  This file should be a Windows icon file (.ico)
@@ -150,7 +150,6 @@ html_logo = '_static/cdist-logo.jpeg'
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 # html_static_path = ['_static']
-html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
diff --git a/docs/src/index.rst b/docs/src/index.rst
index 6cbd938a..bef91e1c 100644
--- a/docs/src/index.rst
+++ b/docs/src/index.rst
@@ -1,28 +1,23 @@
-cdist - usable configuration management
-=======================================
-
-cdist is a usable configuration management system.
-It adheres to the KISS principle and 
-is being used in small up to enterprise grade environments.
+Welcome to cdist documentation
+==============================
 
+Contents:
 
 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 2
    :glob:
    :numbered:
-   :hidden:
 
+   cdist-intro
    cdist-why
-   cdist-features
    cdist-os
    cdist-install
-   cdist-upgrade
+   cdist-update
    cdist-support
+   cdist-features
    cdist-quickstart
    cdist-real-world
    man1/cdist
-   man1/cdist-dump
-   man1/cdist-new-type
    cdist-bootstrap
    cdist-configuration
    cdist-manifest
diff --git a/docs/src/man1/cdist-dump.rst b/docs/src/man1/cdist-dump.rst
deleted file mode 100644
index 907cd192..00000000
--- a/docs/src/man1/cdist-dump.rst
+++ /dev/null
@@ -1,110 +0,0 @@
-cdist-dump(1)
-=============
-
-NAME
-----
-cdist-dump - Dump data from local cdist cache
-
-
-SYNOPSIS
---------
-
-::
-
-    cdist-dump [options] [host...]
-
-
-
-DESCRIPTION
------------
-cdist-dump is a helper script that dumps data from local cdist cache for
-specified hosts. If host is not specified then all data from cache directory
-is dumped. Default cache directory is '~/.cdist/cache'.
-
-cdist-dump can be used for debugging existing types, host configuration and
-new types. 
-
-
-OPTIONS
--------
-**-a**
-   dump all
-
-**-C CACHE-DIR**
-   use specified CACHE-DIR (default: ~/.cdist/cache)
-
-**-c**
-   dump code-*
-
-**-d DELIMITER**
-   delimiter used for filename and line number prefix (default: ':')
-
-**-E**
-   dump global explorers
-
-**-e**
-   dump type explorers
-
-**-F**
-   disable filename prefix (enabled by default)
-
-**-f**
-   enable filename prefix (default)
-
-**-g**
-   dump gencode-*
-
-**-h**
-   show this help screen and exit
-
-**-L**
-   disable line number prefix (default)
-
-**-l**
-   enable line number prefix (disabled by default)
-
-**-m**
-   dump messages
-
-**-o**
-   dump executions' stdout
-
-**-p**
-   dump parameters
-
-**-r**
-   dump executions' stderr
-
-**-V**
-   show version and exit
-
-**-v**
-   increase verbosity
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # Dump all
-    % cdist-dump -a
-
-    # Dump only code-* output
-    % cdist-dump -c
-
-
-SEE ALSO
---------
-:strong:`cdist`\ (1)
-
-
-AUTHORS
--------
-Darko Poljak <darko.poljak--@--ungleich.ch>
-
-
-COPYING
--------
-Copyright \(C) 2019 Darko Poljak. Free use of this software is
-granted under the terms of the GNU General Public License v3 or later (GPLv3+).
diff --git a/docs/src/man1/cdist-new-type.rst b/docs/src/man1/cdist-new-type.rst
deleted file mode 100644
index f1a8b992..00000000
--- a/docs/src/man1/cdist-new-type.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-cdist-new-type(1)
-=================
-
-NAME
-----
-cdist-new-type - Create new type skeleton
-
-
-SYNOPSIS
---------
-
-::
-
-    cdist-new-type TYPE-NAME AUTHOR-NAME AUTHOR-EMAIL [TYPE-BASE-PATH]
-
-
-
-DESCRIPTION
------------
-cdist-new-type is a helper script that creates new type skeleton.
-It is then up to the type author to finish the type.
-
-It creates skeletons for the following files:
-
-* man.rst
-* manifest
-* gencode-remote.
-
-Upon creation it prints the path to the newly created type directory.
-
-
-ARGUMENTS
----------
-**TYPE-NAME**
-   Name of the new type.
-
-**AUTHOR-NAME**
-   Type author's full name.
-
-**AUTHOR-NAME**
-   Type author's email.
-
-**TYPE-BASE-PATH**
-    Path to the base directory of the type. If not set it defaults
-    to '$PWD/type'.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # Create new type __foo in ~/.cdist directory.
-    $ cd ~/.cdist
-    $ cdist-new-type '__foo' 'Foo Bar' 'foo.bar at foobar.org'
-    /home/foo/.cdist/type/__foo
-
-
-SEE ALSO
---------
-:strong:`cdist`\ (1)
-
-
-AUTHORS
--------
-
-| Steven Armstrong <steven-cdist--@--armstrong.cc>
-| Darko Poljak <darko.poljak--@--ungleich.ch>
-
-
-COPYING
--------
-Copyright \(C) 2019 Steven Armstrong, Darko Poljak. Free use of this software is
-granted under the terms of the GNU General Public License v3 or later (GPLv3+).
diff --git a/docs/src/man1/cdist.rst b/docs/src/man1/cdist.rst
index 30832f2f..3a74f1ef 100644
--- a/docs/src/man1/cdist.rst
+++ b/docs/src/man1/cdist.rst
@@ -15,23 +15,23 @@ SYNOPSIS
 
     cdist banner [-h] [-l LOGLEVEL] [-q] [-v]
 
-    cdist config [-h] [-l LOGLEVEL] [-q] [-v] [-b] [-g CONFIG_FILE] [-4]
-                 [-6] [-C CACHE_PATH_PATTERN] [-c CONF_DIR] [-i MANIFEST]
-                 [-j [JOBS]] [-n] [-o OUT_PATH] [-P]
-                 [-R [{tar,tgz,tbz2,txz}]] [-r REMOTE_OUT_PATH]
-                 [--remote-copy REMOTE_COPY] [--remote-exec REMOTE_EXEC]
-                 [-S] [-I INVENTORY_DIR] [-A] [-a] [-f HOSTFILE]
-                 [-p [HOST_MAX]] [-s] [-t]
-                 [host [host ...]]
+    cdist config [-h] [-l LOGLEVEL] [-q] [-v] [-b] [-g CONFIG_FILE]
+                 [-C CACHE_PATH_PATTERN] [-c CONF_DIR] [-i MANIFEST]
+                 [-j [JOBS]] [-n] [-o OUT_PATH] [-R [{tar,tgz,tbz2,txz}]]
+                 [-r REMOTE_OUT_DIR] [--remote-copy REMOTE_COPY]
+                 [--remote-exec REMOTE_EXEC] [-I INVENTORY_DIR] [-4] [-6]
+                 [-A] [-a] [-f HOSTFILE] [-P] [-p [HOST_MAX]] [-S] [-s]
+                 [-t]
+                 [host [host ...]] 
 
-    cdist install [-h] [-l LOGLEVEL] [-q] [-v] [-b] [-g CONFIG_FILE] [-4]
-                  [-6] [-C CACHE_PATH_PATTERN] [-c CONF_DIR] [-i MANIFEST]
-                  [-j [JOBS]] [-n] [-o OUT_PATH] [-P]
-                  [-R [{tar,tgz,tbz2,txz}]] [-r REMOTE_OUT_PATH]
-                  [--remote-copy REMOTE_COPY] [--remote-exec REMOTE_EXEC]
-                  [-S] [-I INVENTORY_DIR] [-A] [-a] [-f HOSTFILE]
-                  [-p [HOST_MAX]] [-s] [-t]
-                  [host [host ...]]
+    cdist install [-h] [-l LOGLEVEL] [-q] [-v] [-b] [-g CONFIG_FILE]
+                  [-C CACHE_PATH_PATTERN] [-c CONF_DIR] [-i MANIFEST]
+                  [-j [JOBS]] [-n] [-o OUT_PATH] [-R [{tar,tgz,tbz2,txz}]]
+                  [-r REMOTE_OUT_DIR] [--remote-copy REMOTE_COPY]
+                  [--remote-exec REMOTE_EXEC] [-I INVENTORY_DIR] [-4] [-6]
+                  [-A] [-a] [-f HOSTFILE] [-P] [-p [HOST_MAX]] [-S] [-s]
+                  [-t]
+                  [host [host ...]] 
 
     cdist inventory [-h] {add-host,add-tag,del-host,del-tag,list} ...
 
@@ -165,7 +165,7 @@ Install command is currently in beta.
     Operate in parallel in specified maximum number of
     jobs. Global explorers, object prepare and object run
     are supported. Without argument CPU count is used by
-    default.
+    default. Currently in beta.
 
 **-n, --dry-run**
     Do not execute code.
diff --git a/docs/web/cdist.mdwn b/docs/web/cdist.mdwn
new file mode 100644
index 00000000..74457fc8
--- /dev/null
+++ b/docs/web/cdist.mdwn
@@ -0,0 +1,21 @@
+[[!meta title="cdist - usable configuration management"]]
+
+![cdist-logo](cdist-logo.png "cdist logo")
+
+cdist is a usable configuration management system.
+It adheres to the KISS principle and 
+is being used in small up to enterprise grade environments.
+cdist is an alternative to other configuration management systems like
+[bcfg2](http://trac.mcs.anl.gov/projects/bcfg2),
+[chef](http://wiki.opscode.com/display/chef/),
+[cfengine](http://www.cfengine.org/)
+and [puppet](http://www.puppetlabs.com/).
+
+ * [[Why should I use cdist?|why]]
+ * [[Documentation|documentation]]
+ * [[Supported Operating Systems|os]]
+ * [[Installation|install]]
+ * [[Update|update]]
+ * [[Support|support]]
+
+[[!tag cdist unix]]
diff --git a/docs/web/cdist/cdist-logo.png b/docs/web/cdist/cdist-logo.png
new file mode 100644
index 00000000..13c27927
Binary files /dev/null and b/docs/web/cdist/cdist-logo.png differ
diff --git a/docs/web/cdist/documentation.mdwn b/docs/web/cdist/documentation.mdwn
new file mode 100644
index 00000000..6479a4bb
--- /dev/null
+++ b/docs/web/cdist/documentation.mdwn
@@ -0,0 +1,12 @@
+[[!meta title="Documentation"]]
+
+You can browse the
+[latest version of the documentation](/software/cdist/man/latest) or
+have a look at [all versions](/software/cdist/man).
+
+You can also view [speeches about cdist](/software/cdist/speeches).
+
+Checking out beta? Find the docs here:
+[beta documentation](/software/cdist/man/beta).
+
+[[!tag cdist unix]]
diff --git a/docs/web/cdist/features.mdwn b/docs/web/cdist/features.mdwn
new file mode 100644
index 00000000..77c61382
--- /dev/null
+++ b/docs/web/cdist/features.mdwn
@@ -0,0 +1,26 @@
+But cdist ticks differently, here is the feature set that makes it unique:
+
+[[!table  data="""
+Keywords | Description
+Simplicity | There is only one type to extend cdist called ***type***
+Design | Type and core cleanly separated
+Design | Sticks completly to the KISS (keep it simple and stupid) paradigma
+Design | Meaningful error messages - do not lose time debugging error messages
+Design | Consistency in behaviour, naming and documentation
+Design | No surprise factor: Only do what is obviously clear, no magic
+Design | Define target state, do not focus on methods or scripts
+Design | Push architecture: Instantly apply your changes
+Small core | cdist's core is very small - less code, less bugs
+Fast development | Focus on straightforwardness of type creation is a main development objective
+Fast development | Batteries included: A lot of requirements can be solved using standard types
+Modern Programming Language | cdist is written in Python
+Requirements, Scalability | No central server needed, cdist operates in push mode and can be run from any computer
+Requirements, Scalability, Upgrade | cdist only needs to be updated on the master, not on the target hosts
+Requirements, Security | Uses well-know [SSH](http://www.openssh.com/) as transport protocol
+Requirements, Simplicity | Requires only shell and SSH server on the target
+UNIX | Reuse of existing tools like cat, find, mv, ... 
+UNIX, familar environment, documentation | Is available as manpages and HTML
+UNIX, simplicity, familar environment | cdist is configured in POSIX shell
+"""]]
+
+[[!tag cdist unix]]
diff --git a/docs/web/cdist/install.mdwn b/docs/web/cdist/install.mdwn
new file mode 100644
index 00000000..0ced26db
--- /dev/null
+++ b/docs/web/cdist/install.mdwn
@@ -0,0 +1,103 @@
+[[!meta title="How to install cdist"]]
+[[!toc levels=3]]
+
+## Requirements
+
+### Source Host
+
+This is the machine you use to configure the target hosts.
+
+ * /bin/sh: A posix like shell (for instance bash, dash, zsh)
+ * Python >= 3.2
+ * SSH client
+ * Asciidoc and xsltproc (for building the manpages)
+
+### Target Hosts
+
+ * /bin/sh: A posix like shell (for instance bash, dash, zsh)
+ * SSH server
+
+## Install cdist
+
+You can install cdist either from git or as a python package.
+
+### From git
+
+Cloning cdist from git gives you the advantage of having
+a version control in place for development of your own stuff
+immediately.
+
+To install cdist, execute the following commands:
+
+    git clone https://github.com/ungleich/cdist.git
+    cd cdist
+    export PATH=$PATH:$(pwd -P)/bin
+
+From version 4.2.0 cdist tags and github releases are signed.
+You can get GPG public key used for signing [here](/software/cdist/pgp-key-EFD2AE4EC36B6901.asc).
+
+#### Available versions in git
+
+ * The active development takes place in the **master** branch
+ * The current stable version can be found in the **2.0** branch
+ * The upcoming stable version can be found in the **2.1** branch
+
+Other branches may be available for features or bugfixes, but they
+may vanish at any point. To select a specific branch use
+
+    # Generic code
+    git checkout -b <localbranchname> origin/<branchname>
+
+So for instance if you want to use and stay with version 2.0, you can use
+
+    git checkout -b 2.0 origin/2.0
+
+#### Git Mirrors
+
+If the main site is down, you can acquire cdist from one of the following sites:
+
+ * git://github.com/telmich/cdist.git ([github](https://github.com/telmich/cdist))
+ * git://git.code.sf.net/p/cdist/code ([sourceforge](https://sourceforge.net/p/cdist/code))
+
+#### Building and using documentation (man and html)
+
+If you want to build and use the documentation, run:
+
+    make docs
+
+Documentation comes in two formats, man pages and full HTML
+documentation. Documentation is built into distribution's
+docs/dist directory. man pages are in docs/dist/man and
+HTML documentation in docs/dist/html.
+
+If you want to use man pages, run:
+
+    export MANPATH=$MANPATH:$(pwd -P)/docs/dist/man
+
+Or you can move manpages from docs/dist/man directory to some
+other directory and add it to MANPATH.
+
+Full HTML documentation can be accessed at docs/dist/html/index.html.
+
+You can also build manpages for types in your ~/.cdist directory:
+
+    make dotman
+
+Built manpages are now in docs/dist/man directory. If you have
+some other custom .cdist directory, e.g. /opt/cdist then use:
+
+    DOT_CDIST_PATH=/opt/cdist make dotman
+
+
+### Python Package
+
+Cdist is available as a python package at
+[PyPi](http://pypi.python.org/pypi/cdist/). You can install it using
+
+    pip install cdist
+
+## Use cdist
+
+[[Dig into the documentation|documentation]] to get started with cdist!
+
+[[!tag cdist unix]]
diff --git a/docs/web/cdist/os.mdwn b/docs/web/cdist/os.mdwn
new file mode 100644
index 00000000..3677f52c
--- /dev/null
+++ b/docs/web/cdist/os.mdwn
@@ -0,0 +1,18 @@
+[[!meta title="Supported Operating Systems"]]
+
+cdist was tested or is know to run on at least
+
+ * [Archlinux](http://www.archlinux.org/)
+ * [Debian](http://www.debian.org/)
+ * [CentOS](http://www.centos.org/)
+ * [Scientific](https://www.scientificlinux.org/)
+ * [Fedora](http://fedoraproject.org/)
+ * [FreeBSD](http://www.freebsd.org)
+ * [Gentoo](http://www.gentoo.org/)
+ * [Mac OS X](http://www.apple.com/macosx/)
+ * [OpenBSD](http://www.openbsd.org)
+ * [Redhat](http://www.redhat.com/)
+ * [Ubuntu](http://www.ubuntu.com/)
+ * [XenServer](http://www.citrix.com/xenserver/)
+
+[[!tag cdist unix]]
diff --git a/docs/src/_static/pgp-key-EFD2AE4EC36B6901.asc b/docs/web/cdist/pgp-key-EFD2AE4EC36B6901.asc
similarity index 100%
rename from docs/src/_static/pgp-key-EFD2AE4EC36B6901.asc
rename to docs/web/cdist/pgp-key-EFD2AE4EC36B6901.asc
diff --git a/docs/web/cdist/support.mdwn b/docs/web/cdist/support.mdwn
new file mode 100644
index 00000000..4f92853b
--- /dev/null
+++ b/docs/web/cdist/support.mdwn
@@ -0,0 +1,28 @@
+## Support
+
+### IRC
+
+You can join the development ***IRC channel***
+[#cstar on irc.freenode.net](irc://irc.freenode.org/#cstar).
+
+### Mailing list
+
+Bug reports, questions, patches, etc. should be send to the
+[cdist mailing list](https://groups.google.com/forum/#!forum/cdist-configuration-management).
+
+### Linkedin
+
+If you have an account
+at [Linked in](http://www.linkedin.com/),
+you can join the
+[cdist group](http://www.linkedin.com/groups/cdist-configuration-management-3952797).
+
+### Chat
+Chat with us: [ungleich chat](https://chat.ungleich.ch/channel/cdist).
+
+### Commercial support
+
+You can request commercial support for cdist from
+[my company](http://www.ungleich.ch/english/).
+
+[[!tag cdist unix]]
diff --git a/docs/web/cdist/update.mdwn b/docs/web/cdist/update.mdwn
new file mode 100644
index 00000000..df4617bb
--- /dev/null
+++ b/docs/web/cdist/update.mdwn
@@ -0,0 +1,158 @@
+[[!meta title="How to update cdist"]]
+
+## Update The Git Installation
+
+To upgrade cdist in the current branch use
+
+    git pull
+
+    # Also update the manpages
+    ./build man
+    export MANPATH=$MANPATH:$(pwd -P)/doc/man
+
+If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.
+The master branch on the other hand is the development branch and may not be
+working, break your setup or eat the tree in your garden.
+
+### Safely upgrading to new versions
+
+To upgrade to **any** further cdist version, you can take the
+following procedure to do a safe upgrade:
+
+    # Create new branch to try out the update
+    git checkout -b upgrade_cdist
+
+    # Get latest cdist version in git database
+    git fetch -v
+
+    # see what will happen on merge - replace
+    # master with the branch you plan to merge
+    git diff upgrade_cdist..origin/master
+
+    # Merge the new version
+    git merge origin/master
+
+Now you can ensure all custom types work with the new version.
+Assume that you need to go back to an older version during
+the migration/update, you can do so as follows:
+
+    # commit changes
+    git commit -m ...
+
+    # go back to original branch
+    git checkout master
+
+After that, you can go back and continue the upgrade:
+
+    # git checkout upgrade_cdist
+
+
+## Update The Python Package
+
+To upgrade to the lastet version do
+
+    pip install --upgrade cdist
+
+## General Update Instructions
+
+### Updating from 3.0 to 3.1
+
+The type **\_\_ssh_authorized_keys** now also manages existing keys, 
+not only the ones added by cdist.
+
+### Updating from 2.3 to 3.0
+
+The **changed** attribute of objects has been removed.
+Use [messaging](/software/cdist/man/3.0.0/man7/cdist-messaging.html) instead.
+
+### Updating from 2.2 to 2.3
+
+No incompatibilities.
+
+### Updating from 2.1 to 2.2
+
+Starting with 2.2, the syntax for requiring a singleton type changed:
+Old format:
+
+    require="__singleton_type/singleton" ...
+
+New format:
+
+    require="__singleton_type" ...
+
+Internally the "singleton" object id was dropped to make life more easy.
+You can probably fix your configuration by running the following code
+snippet (currently untested, please report back if it works for you):
+
+    find ~/.cdist/* -type f -exec sed -i 's,/singleton,,' {} \;
+
+### Updating from 2.0 to 2.1
+
+Have a look at the update guide for [[2.0 to 2.1|2.0-to-2.1]].
+
+ * Type **\_\_package* and \_\_process** use --state **present** or **absent**.
+   The states **removed/installed** and **stopped/running** have been removed.
+   Support for the new states is already present in 2.0.
+ * Type **\_\_directory**: Parameter --parents and --recursive are now boolean
+   The old "yes/no" values need to be removed.
+ * Type **\_\_rvm_ruby**: Parameter --default is now boolean
+   The old "yes/no" values need to be removed.
+ * Type **\_\_rvm_gemset**: Parameter --default is now boolean
+   The old "yes/no" values need to be removed.
+ * Type **\_\_addifnosuchline** and **\_\_removeline** have been replaced by **\_\_line**
+ * The **conf** directory is now located at **cdist/conf**.
+   You need to migrate your types, explorers and manifests
+   manually to the new location.
+ * Replace the variable **\_\_self** by **\_\_object_name**
+   Support for the variable **\_\_object_name** is already present in 2.0.
+ * The types **\_\_autofs**, **\_\_autofs_map** and **\_\_autofs_reload** have been removed
+   (no maintainer, no users)
+ * Type **\_\_user**: Parameter --groups removed (use the new \_\_user_groups type)
+ * Type **\_\_ssh_authorized_key** has been replaced by more flexible type 
+    **\_\_ssh_authorized_keys**
+
+### Updating from 1.7 to 2.0
+
+* Ensure python (>= 3.2) is installed on the source host
+* Use "cdist config host" instead of "cdist-deploy-to host"
+* Use "cdist config -p host1 host2" instead of "cdist-mass-deploy"
+* Use "cdist banner" for fun
+* Use **\_\_object_name** instead of **\_\_self** in manifests
+
+### Updating from 1.6 to 1.7
+
+* If you used the global explorer **hardware_type**, you need to change
+  your code to use **machine** instead.
+
+### Updating from 1.5 to 1.6
+
+* If you used **\_\_package_apt --preseed**, you need to use the new
+  type **\_\_debconf_set_selections** instead.
+* The **\_\_package** types accepted either --state deinstalled or
+  --state uninstaaled. Starting with 1.6, it was made consistently
+  to --state removed.
+
+### Updating from 1.3 to 1.5
+
+No incompatibilities.
+
+### Updating from 1.2 to 1.3
+
+Rename **gencode** of every type to **gencode-remote**.
+
+### Updating from 1.1 to 1.2
+
+No incompatibilities.
+
+### Updating from 1.0 to 1.1
+
+In 1.1 the type **\_\_file** was split into **\_\_directory**, **\_\_file** and
+**\_\_link**. The parameter **--type** was removed from **\_\_file**. Thus you
+need to replace **\_\_file** calls in your manifests:
+
+ * Remove --type from all \_\_file calls
+ * If type was symlink, use \_\_link and --type symbolic
+ * If type was directory, use \_\_directory
+
+
+[[!tag cdist unix]]
diff --git a/docs/web/cdist/update/2.0-to-2.1.mdwn b/docs/web/cdist/update/2.0-to-2.1.mdwn
new file mode 100644
index 00000000..3b5f5dc4
--- /dev/null
+++ b/docs/web/cdist/update/2.0-to-2.1.mdwn
@@ -0,0 +1,118 @@
+[[!meta title="Update Guide for 2.0 to 2.1"]]
+
+## Introduction
+
+When changing your installation from 2.0 to 2.1, there are
+a lot of changes coming up. 2.1 is mainly a cleanup release,
+which removes long time deprecated behaviour, but also makes
+a lot of things more consistent and allows you to split off your types,
+explorers and manifest to custom directories.
+
+This document will guide you to a successful update.
+
+## Preparation
+
+As for every software and system you use in production, you should first of 
+all make a backup of your data. To prevent any breakage, it is
+recommended to create a new git branch to do the update on:
+
+    % git checkout -b update_to_2.1
+
+This also ensure that whenever you need to do a change in your
+2.0 based tree, you can simply go back to that branch, apply the change
+and configure your systems - independently of your update progress!
+
+Next fetch the latest upstream changes, I assume that
+origin refers to one of the upstream mirrors (change origin if you use
+another remote name for upstream cdist):
+
+    % git fetch -v origin
+
+## Merge the changes
+
+Now try to merge upstream into the new branch.
+
+    % git merge origin/2.1
+
+Fix any conflicts that may have been occurred due to local changes
+and then **git add** and *git commit** those changes. This should seldom 
+occur and if, it's mostly for people hacking on the cdist core.
+
+## Move "conf" directory
+
+One of the biggest changes in cdist 2.1 is that you can have multiple
+**conf** directories: Indeed, the new default behaviour of cdist is to
+search for conf directories
+
+ * below the python module (cdist/conf in the source tree or in the installed location)
+ * at ~/.cdist/ (on conf suffix there)
+
+So you can now choose, where to store your types.
+
+### Integrate your conf/ back into the tree
+
+If you choose to store your types together with the upstream types,
+you can just move all your stuff below **cdist/conf**:
+
+    % git mv conf/type/* cdist/conf/type
+    % git mv conf/manifest/* cdist/conf/manifest
+    % git mv conf/explorer/* cdist/conf/explorer
+    % git commit -m "Re-Integrate my conf directory into cdist 2.1 tree"
+
+### Move your conf/ directory to ~/.cdist
+
+If you want to store your site specific
+configuration outside of the cdist tree, you
+can move your conf/ directory to your homedirectory ($HOME) under ~/.cdist:
+
+    % mv conf ~/.cdist
+    % git rm -r conf
+    % git commit -m "Move my conf directory to ~/.cdist"
+
+It it still recommended to use a version control system like git in it:
+
+    % cd ~/.cdist
+    % git init
+    % git add .
+    % git commit -m "Create new git repository containing my cdist configuration"
+
+## Test the migration
+
+Some of the types shipped with upstream were changed, so you may want to test 
+the result by running cdist on one of your staging target hosts:
+
+    % ./bin/cdist config -v staging-host
+
+All incompatibilities are listed on the [[cdist update page|software/cdist/update]],
+so you can browse through the list and update your configuration.
+
+## Final Cleanups
+
+When everything is tested, there are some cleanups to be done to finalise the update.
+
+### When continuing to keep conf/ in the tree
+
+You can then merge back your changes into the master tree and continue to work
+as normal.
+
+### When using ~/.cdist
+
+If you decided to move your site specific code to ~/.cdist, you can now switch your
+**master** branch or version branch to upstream directly. Assumnig you are in the
+cdist directory, having your previous branch checked out, you can create a clean
+state using the following commands:
+
+    % upstream_branch=2.1
+    % current_branch=$(git rev-parse --abbrev-ref HEAD)
+    % git checkout -b archive_my_own_tree
+    % git branch -D "$current_branch"
+    % git checkout -b "$current_branch" "origin/$upstream_branch"
+
+Afther these commands, your previous main branch is accessible at
+**archive_my_own_tree** and your branch is now tracking upstream.
+
+## Questions? Critics? Hints?
+
+If you think this manual helped or misses some information, do not 
+hesitate to contact us on any of the usual ways (irc, mailinglist,
+github issue tracker, ...).
diff --git a/docs/web/cdist/why.mdwn b/docs/web/cdist/why.mdwn
new file mode 100644
index 00000000..f571555c
--- /dev/null
+++ b/docs/web/cdist/why.mdwn
@@ -0,0 +1,69 @@
+[[!meta title="Why should I use cdist?"]]
+
+[[!toc]]
+
+There are several motivations to use cdist, these
+are probably the most popular ones.
+
+## Known language
+
+Cdist is being configured in
+[shell script](https://en.wikipedia.org/wiki/Shell_script).
+Shell script is used by UNIX system engineers for decades.
+So when cdist is introduced, your staff does not need to learn a new
+[DSL](https://en.wikipedia.org/wiki/Domain-specific_language)
+or programming language.
+
+## Powerful language
+
+Not only is shell scripting widely known by system engineers,
+but it is also a very powerful language. Here are some features
+which make daily work easy:
+
+ * Configuration can react dynamicly on explored values
+ * High level string manipulation (using sed, awk, grep)
+ * Conditional support (**if, case**)
+ * Loop support (**for, while**)
+ * Support for dependencies between cdist types
+
+## More than shell scripting
+
+If you compare regular shell scripting with cdist, there is one major
+difference: When using cdist types,
+the results are 
+[idempotent](https://en.wikipedia.org/wiki/Idempotence). 
+In practise that means it does not matter in which order you 
+call cdist types, the result is always the same.
+
+## Zero dependency configuration management
+
+Cdist requires very litte on a target system. Even better,
+in almost all cases all dependencies are usually fulfilled.
+Cdist does not require an agent or a high level programming
+languages on the target host: it will run on any host that
+has a **ssh server running** and a posix compatible shell
+(**/bin/sh**). Compared to other configuration management systems,
+it does not require to open up an additional port.
+
+## Push based distribution
+
+Cdist uses the push based model for configuration. In this
+scenario, one (or more) computers connect the target hosts
+and apply the configuration. That way the source host has
+very little requirements: Cdist can even run on a sysadmin
+notebook that is loosely connected to the network and has
+limited amount of resources.
+
+Furthermore, from a security point of view, only one machine 
+needs access to the target hosts. No target hosts will ever
+need to connect back to the source host, which contains the
+full configuration.
+
+## Highly scalable
+
+If at some point you manage more hosts than can be handled from
+a single source host, you can simply add more resources: Either
+add more cores to one host or add hosts.
+Cdist will utilise the given resources in parallel.
+
+[[!tag cdist unix]]
diff --git a/scripts/cdist-dump b/scripts/cdist-dump
deleted file mode 100755
index 83b09eb8..00000000
--- a/scripts/cdist-dump
+++ /dev/null
@@ -1,325 +0,0 @@
-#!/bin/sh
-
-VERSION="0.0.1"
-RELEASE=""
-
-set -u
-# set -x
-
-hosts=
-cache_dir=~/.cdist/cache
-
-do_all=1
-do_global_explorer=
-do_type_explorer=
-do_script_stdout=
-do_script_stderr=
-do_gencode=
-do_code=
-do_messages=
-do_parameter=
-delimiter=':'
-ln=
-filename_prefix=1
-verbose=0
-
-myname=${0##*/}
-
-print_version()
-{
-    printf "%s %s %s\n" "${myname}" "${VERSION}" "${RELEASE}"
-}
-
-usage()
-{
-    cat << eof
-${myname}: [options] [host...]
-eof
-
-    print_version
-
-    cat << eof
-
-Dump data from cache directories.
-
-host      
-    Dump data for specified hosts. If not specified then all data
-    from cache directory is dumped.
-
-Options
- -a             dump all
- -C CACHE-DIR   use specified CACHE-DIR (default: ~/.cdist/cache)
- -c             dump code-*
- -d DELIMITER   delimiter used for filename and line number prefix (default: ':')
- -E             dump global explorers
- -e             dump type explorers
- -F             disable filename prefix (enabled by default)
- -f             enable filename prefix (default)
- -g             dump gencode-*
- -h             show this help screen and exit
- -L             disable line number prefix (default)
- -l             enable line number prefix (disabled by default)
- -m             dump messages
- -o             dump executions' stdout
- -p             dump parameters
- -r             dump executions' stderr
- -V             show version and exit
- -v             increase verbosity
-eof
-}
-
-exit_err()
-{
-    printf "%s\n" "$1"
-    exit 1
-}
-
-# parse options
-while [ "$#" -ge 1 ]
-do
-    case "$1" in
-        -a)
-            do_all=1
-            ;;
-        -C)
-            if [ "$#" -ge 2 ]
-            then
-                case "$2" in
-                    -*)
-                        exit_err "Missing cache directory"
-                        ;;
-                    *)
-                        cache_dir="$2"
-                        shift
-                        ;;
-                esac
-            else
-                exit_err "Missing cache directory"
-            fi
-            ;;
-        -c)
-            do_code=1
-            do_all=
-            ;;
-        -d)
-            if [ "$#" -ge 2 ]
-            then
-                case "$2" in
-                    -*)
-                        exit_err "Missing delimiter"
-                        ;;
-                    *)
-                        delimiter="$2"
-                        shift
-                        ;;
-                esac
-            else
-                exit_err "Missing delimiter"
-            fi
-            ;;
-        -E)
-            do_global_explorer=1
-            do_all=
-            ;;
-        -e)
-            do_type_explorer=1
-            do_all=
-            ;;
-        -F)
-            filename_prefix=
-            ;;
-        -f)
-            filename_prefix=1
-            ;;
-        -g)
-            do_gencode=1
-            do_all=
-            ;;
-        -h)
-            usage
-            exit 0
-            ;;
-        -L)
-            ln=
-            ;;
-        -l)
-            ln=1
-            ;;
-        -m)
-            do_messages=1
-            do_all=
-            ;;
-        -o)
-            do_script_stdout=1
-            do_all=
-            ;;
-        -p)
-            do_parameter=1
-            do_all=
-            ;;
-        -r)
-            do_script_stderr=1
-            do_all=
-            ;;
-        -V)
-            print_version
-            exit 0
-            ;;
-        -v)
-            verbose=$((verbose + 1))
-            ;;
-        *)
-            hosts="${hosts} $1"
-            break
-            ;;
-    esac
-    shift
-done
-
-if [ "${ln}" = "1" ]
-then
-    ln="NR \"${delimiter}\""
-fi
-
-if [ "${filename_prefix}" = "1" ]
-then
-    filename_prefix="{}${delimiter}"
-fi
-
-if [ "${do_all}" = "1" ]
-then
-    do_global_explorer=1
-    do_type_explorer=1
-    do_script_stdout=1
-    do_script_stderr=1
-    do_gencode=1
-    do_code=1
-    do_messages=1
-    do_parameter=1
-fi
-
-set -- -size +0
-set -- "$@" \(
-or=
-
-print_verbose()
-{
-    if [ "${verbose}" -ge "$1" ]
-    then
-        printf "%s\n" "$2"
-    fi
-}
-
-hor_line()
-{
-    if [ $# -gt 0 ]
-    then
-        c="$1"
-    else
-        c='='
-    fi
-    printf "%78s\n" "" | tr ' ' "${c}"
-}
-
-if [ "${do_global_explorer}" ]
-then
-    print_verbose 2 "Dumping global explorers"
-    set -- "$@" ${or} \( \
-                -path "*/explorer/*" -a \
-                ! -path "*/conf/*" -a \
-                ! -path "*/object/*/explorer/*" \
-            \)
-    or="-o"
-fi
-
-if [ "${do_type_explorer}" ]
-then
-    print_verbose 2 "Dumping type explorers"
-    set -- "$@" ${or} -path "*/object/*/explorer/*"
-    or="-o"
-fi
-
-if [ "${do_script_stdout}" ]
-then
-    print_verbose 2 "Dumping execution's stdout"
-    set -- "$@" ${or} -path "*/stdout/*"
-    or="-o"
-fi
-
-if [ "${do_script_stderr}" ]
-then
-    print_verbose 2 "Dumping execution's stderr"
-    set -- "$@" ${or} -path "*/stderr/*"
-    or="-o"
-fi
-
-if [ "${do_gencode}" ]
-then
-    print_verbose 2 "Dumping gencode-*"
-    set -- "$@" ${or} \( -name "gencode-*" -a ! -path "*/stdout/*" -a ! -path "*/stderr/*" \)
-    or="-o"
-fi
-
-if [ "${do_code}" ]
-then
-    print_verbose 2 "Dumping code-*"
-    set -- "$@" ${or} \( -name "code-*" -a ! -path "*/stdout/*" -a ! -path "*/stderr/*" \)
-    or="-o"
-fi
-
-if [ "${do_messages}" ]
-then
-    print_verbose 2 "Dumping messages"
-    set -- "$@" ${or} -name "messages"
-    or="-o"
-fi
-
-if [ "${do_parameter}" ]
-then
-    print_verbose 2 "Dumping parameters"
-    set -- "$@" ${or} -path "*/parameter/*"
-    or="-o"
-fi
-
-set -- "$@" \)
-set -- '.' "$@" -exec awk -v prefix="${filename_prefix}" "{print prefix ${ln} \$0}" {} \;
-
-# printf "+ %s\n" "$*"
-
-print_verbose 2 "Using cache dir: ${cache_dir}"
-
-OLD_PWD=$(pwd)
-cd "${cache_dir}" || exit
-
-# If no host is specified then search all.
-[ -z "${hosts}" ] && hosts="-"
-
-for host in ${hosts}
-do
-    [ "${host}" = "-" ] && host=
-    # find host cache directory
-    host_dir=$(find . -name target_host -exec grep -l "${host}" {} +)
-    print_verbose 3 "found host directory files:"
-    print_verbose 3 "${host_dir}"
-
-    OLD_IFS="${IFS}"
-    IFS="
-    "
-
-    for d in ${host_dir}
-    do
-        dir=$(dirname "${d}")
-
-        print_verbose 0 "target host: $(cat "${dir}/target_host"), host directory: ${dir}"
-        hor_line '='
-
-        PREV_PWD=$(pwd)
-        cd "${dir}" || exit
-        # set -x
-        find "$@"
-        # set +x
-        cd "${PREV_PWD}" || exit
-    done
-    IFS="${OLD_IFS}"
-done
-cd "${OLD_PWD}" || exit
diff --git a/scripts/cdist-new-type b/scripts/cdist-new-type
deleted file mode 100755
index 79dcfd90..00000000
--- a/scripts/cdist-new-type
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-
-basename="${0##*/}"
-
-if [ $# -lt 3 ]
-then
-    printf "usage: %s TYPE-NAME AUTHOR-NAME AUTHOR-EMAIL [TYPE-BASE-PATH]
-    TYPE-NAME       Name of the type.
-    AUTHOR-NAME     Type author's full name.
-    AUTHOR-EMAIL    Type author's email.
-    TYPE-BASE-PATH  Path to the base directory of the type. If not set it defaults
-                    to '\$PWD/type'.\n" "${basename}"
-    exit 1
-fi
-
-type_name="$1"
-shift
-author_name="$1"
-shift
-author_email="$1"
-shift
-
-if [ $# -ge 1 ]
-then
-    type_base_path="$1"
-    shift
-else
-    #type_base_path=~/.cdist/type
-    type_base_path="$PWD/type"
-fi
-
-error() {
-   printf "%s\n" "$*" >&2
-}
-
-die() {
-   error "$@"
-   exit 1
-}
-
-cd "$type_base_path" || die "Could not change to type directory: $type_base_path.
-You have to specify type base path or run me from within a cdist conf directory,
-e.g. ~/.cdist."
-
-year=$(date +%Y)
-copyright="# $year $author_name ($author_email)"
-
-license="# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-"
-
-set -e
-
-mkdir "$type_name"
-cd "$type_name"
-
-### man page
-header="cdist-type${type_name}(7)"
-header_length="${#header}"
-cat >> man.rst << DONE
-$header
-$(while [ "${header_length}" -gt 0 ]; do printf "="; header_length=$((header_length - 1)); done; printf "\n";)
-
-NAME
-----
-cdist-type${type_name} - TODO
-
-
-DESCRIPTION
------------
-This space intentionally left blank.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-None.
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # TODO
-    ${type_name}
-
-
-SEE ALSO
---------
-:strong:\`TODO\`\\ (7)
-
-
-AUTHORS
--------
-$author_name <$author_email>
-
-
-COPYING
--------
-Copyright \(C) $year $author_name. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-DONE
-
-### manifest
-cat >> manifest << DONE
-#!/bin/sh -e
-#
-${copyright}
-#
-${license}
-
-os=\$(cat "\$__global/explorer/os")
-
-case "\$os" in
-   *)
-      printf "Your operating system (%s) is currently not supported by this type (%s)\n" "\$os" "\${__type##*/}" >&2
-      printf "Please contribute an implementation for it if you can.\n" >&2
-      exit 1
-   ;;
-esac
-DONE
-chmod +x manifest
-
-# gencode-remote
-cat >> gencode-remote << DONE
-#!/bin/sh -e
-#
-${copyright}
-#
-${license}
-DONE
-chmod +x gencode-remote
-
-printf "%s/%s\n" "$type_base_path" "$type_name"
diff --git a/setup.py b/setup.py
index ae651125..f29a8998 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,6 @@ def data_finder(data_dir):
 
     return entries
 
-
 cur = os.getcwd()
 os.chdir("cdist")
 package_data = data_finder("conf")
@@ -36,12 +35,12 @@ setup(
     name="cdist",
     packages=["cdist", "cdist.core", "cdist.exec", "cdist.util", ],
     package_data={'cdist': package_data},
-    scripts=["scripts/cdist", "scripts/cdist-dump", "scripts/cdist-new-type"],
+    scripts=["scripts/cdist"],
     version=cdist.version.VERSION,
     description="A Usable Configuration Management System",
     author="Nico Schottelius",
     author_email="nico-cdist-pypi@schottelius.org",
-    url="https://www.cdi.st/",
+    url="http://www.nico.schottelius.org/software/cdist/",
     classifiers=[
         "Development Status :: 6 - Mature",
         "Environment :: Console",