diff --git a/Makefile b/Makefile
index a8e101f1b..35ff802d2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@ lint: frontend-lint backend-lint
 test: frontend-test backend-test i18n-check
 
 .PHONY: backend-%
-backend-%: .develop.env .stack-work.lock # --stack-work-$*
-	$(MAKE) -- --backend-$*
-	# ( $(MAKE) -- --backend-$* || $(MAKE) -- --stack-krow-$* ) && ( $(MAKE) -- --stack-krow-$* )
+backend-%: .develop.env .stack-work.lock --stack-work-$*
+	# $(MAKE) -- --backend-$*
+	( $(MAKE) -- --backend-$* || $(MAKE) -- --stack-krow-$* ) && ( $(MAKE) -- --stack-krow-$* )
 
 .PHONY: --backend-build
 --backend-build: .develop.env
@@ -44,9 +44,9 @@ i18n-check:
 	@echo No missing translations.
 
 .PHONY: database
-database: .develop.env .stack-work.lock # --stack-work-build
-	$(MAKE) -- --database
-	# ( $(MAKE) -- --database || $(MAKE) -- --stack-krow-build ) && ( $(MAKE) -- --stack-krow-build )
+database: .develop.env .stack-work.lock --stack-work-build
+	# $(MAKE) -- --database
+	( $(MAKE) -- --database || $(MAKE) -- --stack-krow-build ) && ( $(MAKE) -- --stack-krow-build )
 
 .PHONY: --database
 --database: .develop.env
@@ -79,7 +79,8 @@ frontend-%: node_modules
 --frontend-test-watch: WATCH=--single-run false
 --frontend-test-watch: --frontend-test
 
-node_modules: .npmrc package.json
+node_modules: package.json
+	$(MAKE) .npmrc
 	npm ci --cache .npm --prefer-offline
 
 .npmrc:
@@ -88,7 +89,7 @@ node_modules: .npmrc package.json
 .PHONY: clean
 clean:
 	rm -rf node_modules
-	rm -rf .stack-work # .stack-work-build .stack-work-run .stack-work-test .stack-work-doc
+	rm -rf .stack-work .stack-work-build .stack-work-run .stack-work-test .stack-work-doc
 
 .PHONY: %.lock
 %.lock:
@@ -98,16 +99,16 @@ clean:
 .develop.env:
 	(in-develop | grep -q 'In develop') || (echo "Not in develop!" 2>&1; exit 1)
 
-# .PHONY: --stack-work-%
-# --stack-work-%: .stack-work.lock
-# 	[[ -d .stack-work && -d .stack-work-$* ]] && (echo ".stack-work collides with .stack-work-$*, please resolve manually" 1>&2; exit 1) || :
-# 	[[ ! -d .stack-work-$* ]] || mv .stack-work-$* .stack-work
-# 
-# .PHONY: --stack-krow-%
-# --stack-krow-%:
-# 	[[ ! -d .stack-work-$* ]] || ( echo ".stack-work-$* already exists, please resolve manually" 1>&2 ; exit 1 )
-# 	mv .stack-work .stack-work-$*
-# 	flock -u .stack-work.lock true
+.PHONY: --stack-work-%
+--stack-work-%: .stack-work.lock
+	[[ -d .stack-work && -d .stack-work-$* ]] && (echo ".stack-work collides with .stack-work-$*, please resolve manually" 1>&2; exit 1) || :
+	[[ ! -d .stack-work-$* ]] || mv .stack-work-$* .stack-work
+
+.PHONY: --stack-krow-%
+--stack-krow-%:
+	[[ ! -d .stack-work-$* ]] || ( echo ".stack-work-$* already exists, please resolve manually" 1>&2 ; exit 1 )
+	mv .stack-work .stack-work-$*
+	flock -u .stack-work.lock true
 
 # watch:
 # 	while true; do \