diff --git a/atben/Makefile b/atben/Makefile
index aa26945..077c57d 100644
--- a/atben/Makefile
+++ b/atben/Makefile
@@ -30,7 +30,7 @@ front:		$(NAME)-Front.ps
 back:		$(NAME)-Back.ps
 		lpr $<
 
-# this needs more work (--exclude-board-edges)
+# --- Industrial production ---------------------------------------------------
 
 PCB_FILES = README-PCB $(NAME)-PCB_Edges.dxf $(NAME).drl \
             $(NAME)-SilkS_Front.gto $(NAME)-Mask_Front.gts \
@@ -39,7 +39,7 @@ PCB_FILES = README-PCB $(NAME)-PCB_Edges.dxf $(NAME).drl \
 
 gerber:
 		pcbnew --plot=gerber \
-		  -l `pcbnew --list-layers atben.brd | tr '\012' ,` \
+		  -l `pcbnew --list-layers $(NAME).brd | tr '\012' ,` \
 		  --fill-all-zones $(NAME).brd \
 		  --exclude-pcb-edge
 
@@ -47,7 +47,7 @@ fab:		gerber
 		pcbnew --plot=dxf -l PCB_Edges $(NAME).brd
 		pcbnew --drill $(NAME).brd
 		tar Ccfz .. $(NAME)-$(VERSION).tar.gz $(PCB_FILES:%=$(DIR)/%)
-		cd ..; zip -l $(DIR)$(NAME)-$(VERSION).zip \
+		cd ..; zip -l $(DIR)/$(NAME)-$(VERSION).zip \
 		  $(PCB_FILES:%=$(DIR)/%)
 
 gerbv:
@@ -58,6 +58,8 @@ gerbv:
 		  $(NAME)-Mask_Front.gts \
 		  $(NAME)-Back.gbl
 
+# --- DIY production (toner transfer) -----------------------------------------
+
 #
 # Postscript for production of front/back layer, using the toner transfer
 # method. Note that other artwork transfer methods may require different
@@ -75,6 +77,8 @@ gerbv:
 %-Back.ps:	%.brd
 		$(PLOT_BRD) -l Back $<
 
+# --- Cleanup -----------------------------------------------------------------
+
 clean:
 		rm -f $(NAME)-Front.ps $(NAME)-Back.ps
 		rm -f $(NAME).drl $(NAME)-PCB_Edges.gbr $(NAME)-PCB_Edges.dxf