Index: include/configs.h
===================================================================
--- include/configs.h	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ include/configs.h	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -731,6 +731,6 @@
 char	*cfgptr[MAXCFG] = {
 
-	cfg_00, cfg_01, cfg_02, cfg_03, cfg_04,
-	cfg_05, cfg_06, cfg_07, cfg_08, cfg_09,
-	cfg_10, cfg_11
-};
+	(char *)cfg_00, (char *)cfg_01, (char *)cfg_02, (char *)cfg_03,
+	(char *)cfg_04,	(char *)cfg_05, (char *)cfg_06, (char *)cfg_07,
+	(char *)cfg_08, (char *)cfg_09, (char *)cfg_10, (char *)cfg_11
+};
Index: include/curpak.h
===================================================================
--- include/curpak.h	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ include/curpak.h	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -32,6 +32,6 @@
 	void		(*e_key)(void);
 	void		(*m_key)(void);
-	void		(*d_key)(void);
-	void		(*not_fld)(short k);
+	void		(*d_key)(short k);
+	short		(*not_fld)(short k);
 	struct fet	*curfet;
 	struct selbox	*csbp;
Index: include/fields.h
===================================================================
--- include/fields.h	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ include/fields.h	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -14,11 +14,11 @@
 	short	frcol;		/* rightmost column of field */
 	short	ftags;		/* field tags / parameters (used variously) */
-	void	(*ebto)(short ftags);
+	short	(*ebto)(short n);
 				/* edit buffer 'to' (setup) function */
-	void	(*ebfrom)(short ftags);
+	short	(*ebfrom)(short n);
 				/* edit buffer 'from' (parse) function */
-	void	(*redisp)(short ftags);
+	short	(*redisp)(short nn);
 				/* field (re)display function */
-	void	(*datain)(short ftags, short asig);
+	short	(*datain)(short nn, short k);
 				/* data entry function */
 };
@@ -31,5 +31,5 @@
 	short	sbymax;		/* maximum y - bottom edge of box */
 	short	sbarg;		/* select box argument */
-	void	(*boxhit)(short sbarg);
+	short	(*boxhit)(short n);
 				/* box-hit function */
 };
Index: include/midas.h
===================================================================
--- include/midas.h	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ include/midas.h	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -8,5 +8,5 @@
 */
 
-typedef	short	(*PFS)();	/* pointer to a function returning a short */
+typedef	void	(*LPF)(short _1, short _2);	/* pointer to a LCD panel function */
 
 #define	SM_SCALE(x)	(((x) * 252) & 0x7FE0)
Index: libcio/clusmap.c
===================================================================
--- libcio/clusmap.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ libcio/clusmap.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -90,4 +90,6 @@
 		if (c EQ '\007')
 			xtrap15();
+
+	return(c);
 }
 
Index: misc/check-glob.py
===================================================================
--- misc/check-glob.py	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ misc/check-glob.py	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -13,4 +13,5 @@
         self.path = None
         self.decl = {}
+        self.errs = []
 
     def visit_Typedef(self, node):
@@ -32,7 +33,7 @@
 
         elif self.decl[node.name] != decl:
-            raise Exception("mismatch for {} in {}:{}: {} <-> {}". \
-                            format(node.name, node.coord.file, node.coord.line, \
-                                   self.decl[node.name], decl))
+            self.errs.append("mismatch for {} in {}:{}: {} <-> {}". \
+                             format(node.name, node.coord.file, node.coord.line, \
+                                    self.decl[node.name], decl))
 
     def visit_FuncDef(self, node):
@@ -46,4 +47,8 @@
         self.visit(ast)
         self.path = None
+
+    def show_errs(self):
+        for err in self.errs:
+            print(err)
 
 path_ast = []
@@ -75,2 +80,3 @@
 
 print("")
+vis.show_errs()
Index: ram/adfield.c
===================================================================
--- ram/adfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/adfield.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -19,15 +19,16 @@
 extern	void	select(void);
 extern	short	whatbox(void);
-extern	short	nokey(void);
+extern	void	nokey(void);
+extern	short	nonf(short k);
 extern	short	stdctp4(void);
 extern	void	cxkstd(void);
 extern	void	cykstd(void);
 extern	void	stdmkey(void);
-extern	void	stddkey(void);
-
-extern	short	et_null(void);
-extern	short	ef_null(void);
-extern	short	rd_null(void);
-extern	short	nd_null(void);
+extern	void	stddkey(short k);
+
+extern	short	et_null(short n);
+extern	short	ef_null(short n);
+extern	short	rd_null(short n);
+extern	short	nd_null(short n, short k);
 extern	short	et_atab(short n);
 extern	short	ef_atab(short n);
@@ -134,5 +135,5 @@
 void	adcxupd(void);
 void	adcyupd(void);
-short	ad_xkey(short nn);
+void	ad_xkey(void);
 
 /* 
@@ -282,5 +283,5 @@
 	stdmkey,	/* m_key */
 	stddkey,	/* d_key */
-	nokey,		/* not_fld */
+	nonf,		/* not_fld */
 	ad_fet1,	/* curfet */
 	adboxes,	/* csbp */
@@ -362,5 +363,5 @@
 */
 
-short ad_xkey(short nn)
+void ad_xkey(void)
 {
 	register short row, col, grp, i;
@@ -382,8 +383,8 @@
 					asgmod = TRUE;
 					adswin(0);
-					return(SUCCESS);
+					return; /* SUCCESS */
 
 				} else
-					return(FAILURE);
+					return; /* FAILURE */
 			case 2:		/* MIDI output port */
 
@@ -393,5 +394,5 @@
 					adswin(hitbox);
 					modasg();
-					return(SUCCESS);
+					return; /* SUCCESS */
 				}
 
@@ -411,5 +412,5 @@
 					adswin(hitbox);
 					modasg();
-					return(SUCCESS);
+					return; /* SUCCESS */
 
 				} else if ((col GE 19) AND (col LE 22)) {
@@ -419,5 +420,5 @@
 					adswin(hitbox);
 					modasg();
-					return(SUCCESS);
+					return; /* SUCCESS */
 				}
 
@@ -434,5 +435,5 @@
 					adswin(hitbox);
 					modasg();
-					return(SUCCESS);
+					return; /* SUCCESS */
 				}
 
@@ -459,5 +460,5 @@
 					drawk2g(grp);
 					modasg();
-					return(SUCCESS);
+					return; /* SUCCESS */
 
 				} else if ((col EQ 48) OR (col EQ 49)) {
@@ -469,5 +470,5 @@
 					adswin(hitbox);
 					modasg();
-					return(SUCCESS);
+					return; /* SUCCESS */
 /* 
 
@@ -486,5 +487,5 @@
 					drawk2g(grp);
 					modasg();
-					return(SUCCESS);
+					return; /* SUCCESS */
 
 				} else if ((col EQ 61) OR (col EQ 62)) {
@@ -496,5 +497,5 @@
 					adswin(hitbox);
 					modasg();
-					return(SUCCESS);
+					return; /* SUCCESS */
 				}
 
@@ -504,5 +505,5 @@
 	}
 
-	return(FAILURE);
+	return; /* FAILURE */
 }
 
Index: ram/adselbx.c
===================================================================
--- ram/adselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/adselbx.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -25,9 +25,9 @@
 #define	ATDECOL	1		/* data entry base column */
 
-extern	void	enterit(void);
+extern	short	entbh(short n);
 extern	void	adswin(short n);
 extern	void	advacur(void);
 extern	void	bspacur(void);
-extern	short	nokey(void);
+extern	void	nokey(void);
 extern	void	vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf);
 extern	void	adpoint(short x, short y, short pen);
@@ -70,5 +70,5 @@
 
 short	bx_null(void);
-void	adfnbox(short n);
+short	adfnbox(short n);
 
 /* 
@@ -80,7 +80,7 @@
 	{  1,   0,  94,  27,      0, adfnbox},	/*  0:  curasg, caname */
 	{  1,  28,  94,  40,      1, adfnbox},	/*  1:  asgtab[curasg] */
-	{  1,  56,  94,  68,      2, enterit},	/*  2:  curmop */
-	{  1,  42,  94,  54,      3, enterit},	/*  3:  prgchan */
-	{ 96,   1, 190, 138,      4, enterit},	/*  4: 	vce2grp[voice] */
+	{  1,  56,  94,  68,      2, entbh},	/*  2:  curmop */
+	{  1,  42,  94,  54,      3, entbh},	/*  3:  prgchan */
+	{ 96,   1, 190, 138,      4, entbh},	/*  4: 	vce2grp[voice] */
 	{192,   1, 302, 138,      5, adfnbox},	/*  5: 	mctlnum[srcvar] */
 	{304,   1, 510, 138,      6, adfnbox},	/*  6:  grp2prt[group][pt|ch] */
@@ -88,5 +88,5 @@
 	{  1,  70,  38,  82,      8, adfnbox},	/*  8:  auxctl */
 	{ 40,  70,  94,  82,      9, adfnbox},	/*  9:  curtun */
-	{  1,  84,  94, 138,     10, enterit},	/* 10:  ps_intn, ps_rate, ps_dpth */
+	{  1,  84,  94, 138,     10, entbh},	/* 10:  ps_intn, ps_rate, ps_dpth */
 
 	{  0,   0,   0,   0,	  0, FN_NULL}		/* end of table */
@@ -207,5 +207,5 @@
 */
 
-void adfnbox(short n)
+short adfnbox(short n)
 {
 	register short i, grp, key, line;
@@ -242,10 +242,9 @@
 				}
 
-				return;
+				return(SUCCESS);
 
 			} else {				/* table */
 
-				enterit();	/* data entry */
-				return;
+				return(entbh(-1));	/* data entry */
 			}
 		}
@@ -303,5 +302,5 @@
 		}
 
-		return;
+		return(SUCCESS);
 /* 
 
@@ -316,5 +315,5 @@
 			putasg(curasg);
 			adswin(0);
-			return;
+			return(SUCCESS);
 
 		} else if ((col GE 6) AND (col LE 10)) {	/* retrieve */
@@ -322,5 +321,5 @@
 			getasg(curasg);
 			awins();
-			return;
+			return(SUCCESS);
 		}
 
@@ -330,5 +329,5 @@
 
 			if ((row LT 5) OR (row GT 8))
-				return;
+				return(FAILURE);
 
 			mctlnum[row - 5] ^= GTAG1;
@@ -345,10 +344,9 @@
 				row, adbox[n][7], bfs, 14);
 
-			return;
+			return(SUCCESS);
 
 		} else {
 
-			enterit();
-			return;
+			return(entbh(-1));
 		}
 /* 
@@ -367,10 +365,10 @@
 				admenu(-1);	/* take down menu */
 
-			return;
+			return(SUCCESS);
 
 		} else if (col EQ 39) {	/* groups 1..6 */
 
 			if ((row LT 4) OR (row GT 9))
-				return;
+				return(FAILURE);
 
 			/* toggle "legato" mode */
@@ -390,5 +388,5 @@
 			       row, col, bfs, 14);
 
-			return;
+			return(SUCCESS);
 /* 
 
@@ -415,10 +413,9 @@
 			       row, col, bfs, 14);
 
-			return;
+			return(SUCCESS);
 
 		} else {
 
-			enterit();	/* data entry */
-			return;
+			return(entbh(-1));	/* data entry */
 		}
 /* 
@@ -428,5 +425,5 @@
 
 		if (admctl NE -1)
-			return;
+			return(FAILURE);
 
 		if (asghit) {
@@ -446,5 +443,5 @@
 
 				if (key-- EQ 0)
-					return;
+					return(FAILURE);
 
 				if (key LT asgfks) {
@@ -487,5 +484,5 @@
 
 				asghit = 0;
-				return;
+				return(FAILURE);
 			}
 
@@ -501,5 +498,5 @@
 
 				asghit = 0;
-				return;
+				return(FAILURE);
 			}
 
@@ -512,5 +509,5 @@
 		}
 
-		return;
+		return(SUCCESS);
 
 	case 8:			/* aux ctl */
@@ -518,5 +515,5 @@
 		setaux(NOT auxctl);
 		adswin(8);
-		return;
+		return(SUCCESS);
 
 	case 9:			/* tuning menu */
@@ -529,12 +526,12 @@
 				admenu(-1);	/* take down menu */
 
-			return;
+			return(SUCCESS);
 
 		} else {
 
-			enterit();	/* data entry */
-			return;
+			return(entbh(-1));	/* data entry */
 		}
 	}
+
+	return(FAILURE);
 }
-
Index: ram/curset.c
===================================================================
--- ram/curset.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/curset.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -44,8 +44,8 @@
 extern	void		(*cy_key)(void);
 extern	void		(*cy_upd)(void);
-extern	void		(*d_key)(void);
+extern	void		(*d_key)(short k);
 extern	void		(*e_key)(void);
 extern	void		(*m_key)(void);
-extern	void		(*not_fld)(short k);
+extern	short		(*not_fld)(short k);
 extern	void		(*premove)(void);
 extern	void		(*pstmove)(void);
Index: ram/enterit.c
===================================================================
--- ram/enterit.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/enterit.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -42,9 +42,9 @@
 extern	void	(*xy_up)(void);
 extern	void	(*xy_dn)(void);
-extern	void	(*not_fld)(short k);
+extern	short	(*not_fld)(short k);
 extern	void	(*x_key)(void);
 extern	void	(*e_key)(void);
 extern	void	(*m_key)(void);
-extern	void	(*d_key)(void);
+extern	void	(*d_key)(short k);
 extern	void	(*premove)(void);
 extern	void	(*pstmove)(void);
@@ -120,7 +120,51 @@
 */
 
-short nokey(void)
-{
-	return(FALSE);
+void nokey(void)
+{
+}
+
+/* 
+
+*/
+
+/*
+   =============================================================================
+	nodkey() -- null d_key function
+   =============================================================================
+*/
+
+void nodkey(short k)
+{
+}
+
+/* 
+
+*/
+
+/*
+   =============================================================================
+	nonf() -- null non_fld function
+   =============================================================================
+*/
+
+short nonf(short k)
+{
+	return(SUCCESS);
+}
+
+/* 
+
+*/
+
+/*
+   =============================================================================
+	entbh() -- data entry box-hit function
+   =============================================================================
+*/
+
+short entbh(short n)
+{
+	enterit();
+	return(SUCCESS);
 }
 
@@ -504,5 +548,5 @@
 */
 
-void stddkey(void)
+void stddkey(short k)
 {
 	if (infield(stcrow, stccol, curfet)) {
Index: ram/etiact.c
===================================================================
--- ram/etiact.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/etiact.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -205,5 +205,5 @@
 */
 
-void rd_iact(short nn)
+short rd_iact(short nn)
 {
 	register short pnt, par, n;
@@ -282,4 +282,6 @@
 	vcputsv(instob, 64, idbox[n][4], idbox[n][5],
 		idbox[n][6] + 1, idbox[n][7], s1, 14);
+
+	return(SUCCESS);
 }
 
Index: ram/etscor.c
===================================================================
--- ram/etscor.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/etscor.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -31,5 +31,5 @@
 */
 
-short et_scor(void)
+short et_scor(short n)
 {
 	sprintf(ebuf, "%02.2d", curscor + 1);
@@ -49,5 +49,5 @@
 */
 
-short ef_scor(void)
+short ef_scor(short n)
 {
 	register short ival;
@@ -78,5 +78,5 @@
 */
 
-short rd_scor(void)
+short rd_scor(short n)
 {
 	sprintf(dspbuf, "%02.2d", curscor + 1);
Index: ram/etstrn.c
===================================================================
--- ram/etstrn.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/etstrn.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -35,5 +35,5 @@
 */
 
-short et_strn(void)
+short et_strn(short n)
 {
 	sprintf(ebuf, "%c%02d", grptran < 0 ? '-' : '+', abs(grptran));
@@ -54,5 +54,5 @@
 */
 
-short ef_strn(void)
+short ef_strn(short n)
 {
 	register short ival;
@@ -77,5 +77,5 @@
 */
 
-short rd_strn(void)
+short rd_strn(short n)
 {
 	sprintf(dspbuf, "%c%02d", grptran < 0 ? '-' : '+', abs(grptran));
Index: ram/idfield.c
===================================================================
--- ram/idfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/idfield.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -20,6 +20,6 @@
 extern	void	select(void);
 extern	void	stdmkey(void);
-extern	void	stddkey(void);
-extern	short	nokey(void);
+extern	void	stddkey(short k);
+extern	void	nokey(void);
 extern	void	cxkstd(void);
 extern	void	cykstd(void);
@@ -36,8 +36,8 @@
 extern	void	showpt(short q);
 
-extern	short	et_null(void);
-extern	short	ef_null(void);
-extern	short	rd_null(void);
-extern	short	nd_null(void);
+extern	short	et_null(short n);
+extern	short	ef_null(short n);
+extern	short	rd_null(short n);
+extern	short	nd_null(short n, short k);
 extern	short	et_ipnt(short n);
 extern	short	ef_ipnt(short n);
@@ -70,5 +70,5 @@
 extern	short	et_iact(short nn);
 extern	short	ef_iact(short nn);
-extern	void	rd_iact(short nn);
+extern	short	rd_iact(short nn);
 extern	short	nd_iact(short nn, short k);
 extern	short	et_iwsn(short nn);
Index: ram/idselbx.c
===================================================================
--- ram/idselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/idselbx.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -21,5 +21,5 @@
 extern	void	tsplot4(int *obase, int nw, int fg, int row, int col, char *str, int pitch);
 extern	void	vbfill4(unsigned *obj, short obwidth, short xmin, short ymin, short xmax, short ymax, unsigned color);
-extern	void	enterit(void);
+extern	short	entbh(short n);
 extern	void	vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf);
 extern	void	advicur(void);
@@ -65,5 +65,5 @@
 
 short	bx_null(void);
-void	idfnbox(short n);
+short	idfnbox(short n);
 
 /* 
@@ -89,16 +89,16 @@
 	{  1,  56, 509, 208,     12, idfnbox},	/* 12: Level */
 
-	{  1, 210, 110, 236, 0x0000, enterit},	/* 13: Source- Mlt */
-	{112, 210, 142, 236, 0x0000, enterit},	/* 14: Pt */
-	{144, 210, 206, 236, 0x0000, enterit},	/* 15: Time */
-	{208, 210, 366, 236, 0x0000, enterit},	/* 16: Value */
-	{368, 210, 509, 236, 0x0000, enterit},	/* 17: Action */
+	{  1, 210, 110, 236, 0x0000, entbh},	/* 13: Source- Mlt */
+	{112, 210, 142, 236, 0x0000, entbh},	/* 14: Pt */
+	{144, 210, 206, 236, 0x0000, entbh},	/* 15: Time */
+	{208, 210, 366, 236, 0x0000, entbh},	/* 16: Value */
+	{368, 210, 509, 236, 0x0000, entbh},	/* 17: Action */
 
 	{  1, 238, 131, 348, 0x0000, idfnbox},	/* 18: Algorithm */
 	{133, 238, 267, 251, 0x0000, idfnbox},	/* 19: Voice & Inst */
-	{269, 238, 379, 306, 0x0000, enterit},	/* 20: Oscillators */
+	{269, 238, 379, 306, 0x0000, entbh},	/* 20: Oscillators */
 	{381, 238, 509, 348, 0x0000, idfnbox},	/* 21: Waveshape */
 
-	{133, 308, 379, 348, 0x0000, enterit},	/* 22: Variables */
+	{133, 308, 379, 348, 0x0000, entbh},	/* 22: Variables */
 
 	{133, 252, 267, 306,     19, idfnbox},	/* 23: Name & Comments */
@@ -435,5 +435,5 @@
 */
 
-void idfnbox(short n)
+short idfnbox(short n)
 {
 	register short col, i, row;
@@ -453,8 +453,6 @@
 		/* handle data entry special case for resonance in filter fn. */
 
-		if ((curfunc EQ 4) AND (row EQ 5) AND (col EQ 62)) {
-			enterit();
-			return;
-		}
+		if ((curfunc EQ 4) AND (row EQ 5) AND (col EQ 62))
+			return(entbh(-1));
 
 		switch (pntsv) {	/* dispatch off of point select state */
@@ -486,5 +484,5 @@
 		}
 
-		return;
+		return(TRUE);
 
 	} else if (hitbox EQ 18) {		/* configuration */
@@ -493,10 +491,9 @@
 
 			wcmenu(0);
-			return;
+			return(TRUE);
 
 		} else {
 
-			enterit();
-			return;
+			return(entbh(-1));
 		}
 /* 
@@ -537,10 +534,9 @@
 			}
 
-			return;
+			return(SUCCESS);
 
 		} else {
 
-			enterit();	/* do data entry */
-			return;
+			return(entbh(-1));	/* do data entry */
 		}
 /* 
@@ -552,10 +548,9 @@
 
 			wcmenu(1);
-			return;
+			return(TRUE);
 
 		} else {
 
-			enterit();
-			return;
+			return(entbh(-1));
 		}
 
@@ -592,5 +587,5 @@
 		}
 
-		return;
+		return(TRUE);
 /* 
 
@@ -622,5 +617,7 @@
 
 		setgc(ICURX, ICURY);		/* put cursor in center */
-		return;
+		return(TRUE);
 	}
-}
+
+	return(FALSE);
+}
Index: ram/im700.c
===================================================================
--- ram/im700.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/im700.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -46,5 +46,6 @@
 extern	unsigned	tofpu(unsigned time);
 
-extern	short	nokey(void);
+extern	void	nokey(void);
+extern	short	nonf(short k);
 extern	void	stdmkey(void);
 extern	void	cxkstd(void);
@@ -57,5 +58,5 @@
 extern	short	blakpal[16][3];
 
-extern	PFS	t_prmtr[];
+extern	LPF	t_prmtr[];
 
 extern	char	*funcndx[256][2];
@@ -92,6 +93,6 @@
 */
 
-extern	PFS	(*oldsw)[];		/* saved swpt value */
-extern	PFS	(*swpt)[];		/* switch dispatch table pointer */
+extern	LPF	(*oldsw)[];		/* saved swpt value */
+extern	LPF	(*swpt)[];		/* switch dispatch table pointer */
 
 extern	void	(*curmove)(void);	/* cursor move function */
@@ -101,8 +102,8 @@
 extern	void	(*cy_key)(void);	/* y rate calculation */
 extern	void	(*cy_upd)(void);	/* y update */
-extern	void	(*d_key)(void);		/* in-field data key processor */
+extern	void	(*d_key)(short k);	/* in-field data key processor */
 extern	void	(*e_key)(void);		/* E key processor */
 extern	void	(*m_key)(void);		/* M key processor */
-extern	void	(*not_fld)(short k);	/* not-in-field data key processor */
+extern	short	(*not_fld)(short k);	/* not-in-field data key processor */
 extern	void	(*premove)(void);	/* cursor pre-move function */
 extern	void	(*pstmove)(void);	/* cursor post-move function */
@@ -876,5 +877,5 @@
 	d_key = nokey;
 
-	not_fld = nokey;
+	not_fld = nonf;
 
 	cx_key  = cxkstd;	/* setup default cursor processors */
Index: ram/lcdlbls.c
===================================================================
--- ram/lcdlbls.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/lcdlbls.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -40,5 +40,5 @@
 #define	ROMPFN	trapper		/* ROMP switch table entry */
 #else
-#define	ROMPFN	nokey		/* ROMP switch table entry */
+#define	ROMPFN	l_none		/* ROMP switch table entry */
 #endif
 
@@ -50,12 +50,11 @@
 extern	char	gain2eq(short gain);
 
-extern	short	nokey(void);
 extern	unsigned	setsr(unsigned sr);
 
-extern	void	(*d_key)(void);
+extern	void	(*d_key)(short k);
 extern	void	(*e_key)(void);
 extern	void	(*m_key)(void);
 extern	void	(*x_key)(void);
-extern	void	(*olddkey)(void);
+extern	void	(*olddkey)(short k);
 extern	void	(*oldekey)(void);
 extern	void	(*oldmkey)(void);
@@ -63,8 +62,8 @@
 extern	void	(*point)(short x, short y, short pen);
 
-extern	PFS	(*oldsw)[];
-extern	PFS	(*swpt)[];
-
-extern	PFS	aswtbl[14];
+extern	LPF	(*oldsw)[];
+extern	LPF	(*swpt)[];
+
+extern	LPF	aswtbl[14];
 
 extern	short	asig;
@@ -125,21 +124,22 @@
 /* forward references */
 
+void	l_none(short _1, short _2);
 void	l_prmtr(short stat, short sig);
 void	l_other(short stat, short sig);
 void	l_voice(short stat, short vce);
 void	l_init(short stat, short sig);
-void	l_clock(short stat);
+void	l_clock(short stat, short _2);
 void	l_eq(short stat, short sig);
-void	trapper(short stat);
-void	setlamp(stat);
-void	rpctl(short stat);
-void	quiet(void);
+void	trapper(short stat, short _2);
+void	setlamp(short stat, short _2);
+void	rpctl(short stat, short _2);
+void	quiet(short _1, short _2);
 void	l_group(short stat, short grp);
-void	l_dflt(short stat);
-void	l_inst(short stat);
-void	l_goto(short stat);
-void	l_asgn(short stat);
-void	l_adfl(short stat);
-void	l_load(short stat);
+void	l_dflt(short stat, short _2);
+void	l_inst(short stat, short _2);
+void	l_goto(short stat, short _2);
+void	l_asgn(short stat, short _2);
+void	l_adfl(short stat, short _2);
+void	l_load(short stat, short _2);
 
 /* initialized stuff */
@@ -248,5 +248,5 @@
 */
 
-PFS	t_prmtr[] = {	/* switch assignments for LS_PRMTR */
+LPF	t_prmtr[] = {	/* switch assignments for LS_PRMTR */
 
 	quiet,		/*  0: Quiet */
@@ -262,6 +262,6 @@
 	l_load,		/*  8: Load */
 
-	nokey,		/*  9: -unused- */
-	nokey,		/* 10: -unused- */
+	l_none,		/*  9: -unused- */
+	l_none,		/* 10: -unused- */
 	l_other,	/* 11: Other */
 
@@ -270,5 +270,5 @@
 };
 
-PFS	t_voice[] = {	/* switch assignments for LS_VOICE */
+LPF	t_voice[] = {	/* switch assignments for LS_VOICE */
 
 	l_voice,	/*  0: toggle voice status */
@@ -296,5 +296,5 @@
 */
 
-PFS	t_other[] = {	/* switch assignments for LS_OTHER */
+LPF	t_other[] = {	/* switch assignments for LS_OTHER */
 
 	quiet,		/*  0: Quiet */
@@ -310,6 +310,6 @@
 	l_load,		/*  8: Load */
 
-	nokey,		/*  9: -unused- */
-	nokey,		/* 10: -unused- */
+	l_none,		/*  9: -unused- */
+	l_none,		/* 10: -unused- */
 	l_eq,		/* 11: EQ */
 
@@ -318,5 +318,5 @@
 };
 
-PFS	t_eq[] = {	/* switch assignments for LS_EQ */
+LPF	t_eq[] = {	/* switch assignments for LS_EQ */
 
 	quiet,		/*  0: Quiet */
@@ -332,6 +332,6 @@
 	l_load,		/*  8: Load */
 
-	nokey,		/*  9: -unused- */
-	nokey,		/* 10: -unused- */
+	l_none,		/*  9: -unused- */
+	l_none,		/* 10: -unused- */
 	l_eq,		/* 11: Prmtr */
 
@@ -344,5 +344,5 @@
 */
 
-PFS	t_inst[] = {	/* switch assignments for LS_INST */
+LPF	t_inst[] = {	/* switch assignments for LS_INST */
 
 	l_group,	/*  0: toggle group status */
@@ -366,5 +366,5 @@
 };
 
-PFS	t_libr[] = {	/* switch assignments for LS_LIBR */
+LPF	t_libr[] = {	/* switch assignments for LS_LIBR */
 
 	quiet,		/*  0: Quiet */
@@ -375,15 +375,15 @@
 	rpctl,		/*  4: R/P */
 
-	nokey,		/*  5: -unused- */
-	nokey,		/*  6: -unused- */
-	nokey,		/*  7: -unused- */
-	nokey,		/*  8: -unused- */
-
-	nokey,		/*  9: -unused- */
-	nokey,		/* 10: -unused- */
-	nokey,		/* 11: -unused- */
-
-	nokey,		/* 12: -unused- */
-	nokey		/* 13: -unused- */
+	l_none,		/*  5: -unused- */
+	l_none,		/*  6: -unused- */
+	l_none,		/*  7: -unused- */
+	l_none,		/*  8: -unused- */
+
+	l_none,		/*  9: -unused- */
+	l_none,		/* 10: -unused- */
+	l_none,		/* 11: -unused- */
+
+	l_none,		/* 12: -unused- */
+	l_none		/* 13: -unused- */
 };
 
@@ -392,5 +392,5 @@
 */
 
-PFS	t_ngrp[] = {	/* switch assignments for LS_NGRP */
+LPF	t_ngrp[] = {	/* switch assignments for LS_NGRP */
 
 	quiet,		/*  0: Quiet */
@@ -401,18 +401,18 @@
 	rpctl,		/*  4: R/P */
 
-	nokey,		/*  5: -unused- */
-	nokey,		/*  6: -unused- */
-	nokey,		/*  7: -unused- */
-	nokey,		/*  8: -unused- */
-
-	nokey,		/*  9: -unused- */
-	nokey,		/* 10: -unused- */
-	nokey,		/* 11: -unused- */
-
-	nokey,		/* 12: -unused- */
-	nokey		/* 13: -unused- */
+	l_none,		/*  5: -unused- */
+	l_none,		/*  6: -unused- */
+	l_none,		/*  7: -unused- */
+	l_none,		/*  8: -unused- */
+
+	l_none,		/*  9: -unused- */
+	l_none,		/* 10: -unused- */
+	l_none,		/* 11: -unused- */
+
+	l_none,		/* 12: -unused- */
+	l_none		/* 13: -unused- */
 };
 
-PFS	t_load[] = {	/* switch assignments for LS_LOAD */
+LPF	t_load[] = {	/* switch assignments for LS_LOAD */
 
 	quiet,		/*  0: Quiet */
@@ -420,18 +420,18 @@
 
 	setlamp,	/*  2: Lamp */
-	nokey,		/*  3: -unused- */
-	nokey,		/*  4: -unused- */
-
-	nokey,		/*  5: -unused- */
-	nokey,		/*  6: -unused- */
-	nokey,		/*  7: -unused- */
+	l_none,		/*  3: -unused- */
+	l_none,		/*  4: -unused- */
+
+	l_none,		/*  5: -unused- */
+	l_none,		/*  6: -unused- */
+	l_none,		/*  7: -unused- */
 	l_load,		/*  8: Load */
 
-	nokey,		/*  9: -unused- */
-	nokey,		/* 10: -unused- */
-	nokey,		/* 11: -unused- */
-
-	nokey,		/* 12: -unused- */
-	nokey		/* 13: -unused- */
+	l_none,		/*  9: -unused- */
+	l_none,		/* 10: -unused- */
+	l_none,		/* 11: -unused- */
+
+	l_none,		/* 12: -unused- */
+	l_none		/* 13: -unused- */
 };
 
@@ -442,9 +442,23 @@
 /*
    =============================================================================
+	l_none() -- null function
+   =============================================================================
+*/
+
+void l_none(short _1, short _2)
+{
+}
+
+/* 
+
+*/
+
+/*
+   =============================================================================
 	quiet() -- quiet the instrument
    =============================================================================
 */
 
-void quiet(void)
+void quiet(short _1, short _2)
 {
 	register short vce;
@@ -469,5 +483,5 @@
 */
 
-void rpctl(short stat)
+void rpctl(short stat, short _2)
 {
 	if (NOT stat)
@@ -488,5 +502,5 @@
 */
 
-void trapper(short stat)
+void trapper(short stat, short _2)
 {
 	if (stat)
@@ -500,5 +514,5 @@
 */
 
-void l_clock(short stat)
+void l_clock(short stat, short _2)
 {
 	if (NOT stat)
@@ -588,5 +602,5 @@
 */
 
-void setlamp(stat)
+void setlamp(short stat, short _2)
 {
 	register short oldi;
@@ -729,5 +743,5 @@
 */
 
-void l_load(short stat)
+void l_load(short stat, short _2)
 {
 	if (NOT stat)
@@ -1023,5 +1037,5 @@
 */
 
-void l_adfl(short stat)
+void l_adfl(short stat, short _2)
 {
 	if (NOT stat)
@@ -1041,5 +1055,5 @@
 */
 
-void l_asgn(short stat)
+void l_asgn(short stat, short _2)
 {
 	if (NOT stat)			/* only do this on key closure */
@@ -1114,5 +1128,5 @@
 */
 
-void l_inst(short stat)
+void l_inst(short stat, short _2)
 {
 	if (NOT stat)
@@ -1253,5 +1267,5 @@
 */
 
-void l_dflt(short stat)
+void l_dflt(short stat, short _2)
 {
 	if (NOT stat)
@@ -1271,5 +1285,5 @@
 */
 
-void l_goto(short stat)
+void l_goto(short stat, short _2)
 {
 	if (NOT stat)			/* only do this on key closure */
Index: ram/ldfield.c
===================================================================
--- ram/ldfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/ldfield.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -25,12 +25,13 @@
 extern	void	select(void);
 extern	short	whatbox(void);
-extern	short	nokey(void);
+extern	void	nokey(void);
+extern	short	nonf(short k);
 extern	void	cxkstd(void);
 extern	void	cykstd(void);
 extern	void	stdmkey(void);
-extern	short	et_null(void);
-extern	short	ef_null(void);
-extern	short	rd_null(void);
-extern	short	nd_null(void);
+extern	short	et_null(short n);
+extern	short	ef_null(short n);
+extern	short	rd_null(short n);
+extern	short	nd_null(short n, short k);
 extern	void	lmwclr(void);
 extern	void	vcputsv(int *obase, int nw, int fg, int bg, int row, int col, char *str, int pitch);
@@ -101,6 +102,6 @@
 extern	short	ldmap[];
 
-extern	PFS	(*swpt)[];
-extern	PFS	(*oldsw)[];
+extern	LPF	(*swpt)[];
+extern	LPF	(*oldsw)[];
 
 extern	struct	selbox	*csbp;
@@ -110,7 +111,7 @@
 
 void	ld_prmv(void);
-short	ldxkey(void);
+void	ldxkey(void);
 void	ldmkey(void);
-short	ldkey(short k);
+void	ldkey(short k);
 void	ldcxupd(void);
 void	ldcyupd(void);
@@ -177,5 +178,5 @@
 	ldmkey,		/* m_key */
 	ldkey,		/* d_key */
-	nokey,		/* not_fld */
+	nonf,		/* not_fld */
 	ld_fet1,	/* curfet */
 	ldboxes,	/* csbp */
@@ -197,5 +198,5 @@
 */
 
-short ldxkey(void)
+void ldxkey(void)
 {
 	register char *fn;
@@ -204,5 +205,5 @@
 
 	if (NOT astat)		/* only on key closure */
-		return(FAILURE);
+		return; /* FAILURE */
 
 	clrerms();
@@ -217,12 +218,12 @@
 			ldmap[slot] = -1;
 			dpy_scr(ldbox[1][4], slot);
-			return(SUCCESS);
+			return; /* SUCCESS */
 
 		} else
-			return(FAILURE);
+			return; /* FAILURE */
 	}
 
 	if (lcancel(2))
-		return(SUCCESS);
+		return; /* SUCCESS */
 
 	if (NOT ldelsw) {	/* deletion not yet selected ? */
@@ -233,5 +234,5 @@
 
 				if (-1 EQ (slot = lin2slt(stcrow)))
-					return(FAILURE);
+					return; /* FAILURE */
 
 				if (ltagged) {
@@ -242,5 +243,5 @@
 						ltagged = FALSE;
 						showcat();
-						return(FAILURE);
+						return; /* FAILURE */
 					}
 
@@ -266,9 +267,9 @@
 				}
 
-				return(SUCCESS);
+				return; /* SUCCESS */
 			}
 
 			if ((stccol < 13) OR (stccol > 20))	/* name ? */
-				return(FAILURE);
+				return; /* FAILURE */
 
 			if (-1 NE (ldslot = lin2slt(ldrow))) {
@@ -278,5 +279,5 @@
 				dslslot(ldslot, exp_c(LD_DELC), ldrow);
 				ldelsw = TRUE;
-				return(SUCCESS);
+				return; /* SUCCESS */
 			}
 /* 
@@ -293,5 +294,5 @@
 					memset(ldfile, ' ', 8);
 					ldswin(3);
-					return(SUCCESS);
+					return; /* SUCCESS */
 
 				} else if (stccol GE 27) {
@@ -301,9 +302,9 @@
 					memset(ldcmnt, ' ', 37);
 					ldswin(5);
-					return(SUCCESS);
+					return; /* SUCCESS */
 				}
 			}
 
-			return(FAILURE);
+			return; /* FAILURE */
 		}
 
@@ -330,10 +331,10 @@
 			showsiz();
 
-			return(SUCCESS);
+			return; /* SUCCESS */
 		}
 
 		ldelsw = FALSE;
 		showcat();
-		return(SUCCESS);
+		return; /* SUCCESS */
 	}
 }
@@ -501,5 +502,5 @@
 */
 
-short ldkey(short k)
+void ldkey(short k)
 {
 	register short c, col, row, slot;
@@ -507,5 +508,5 @@
 
 	if (NOT astat)				/* only on key closure */
-		return(FAILURE);
+		return;
 
 	if (NOT catin)				/* catalog must be valid */
Index: ram/ldselbx.c
===================================================================
--- ram/ldselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/ldselbx.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -39,5 +39,5 @@
 extern	short	get_tun(void);
 extern	short	get_wav(void);
-extern	short	nokey(void);
+extern	void	nokey(void);
 extern	short	ldline(short cy);
 extern	short	lin2slt(short line);
@@ -121,7 +121,7 @@
 extern	struct	selbox	*curboxp;
 
-extern	PFS	(*swpt)[];
-extern	PFS	(*oldsw)[];
-extern	PFS	t_libr[];
+extern	LPF	(*swpt)[];
+extern	LPF	(*oldsw)[];
+extern	LPF	t_libr[];
 
 extern	char	bfs[];
Index: ram/libdsp.c
===================================================================
--- ram/libdsp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/libdsp.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -997,5 +997,5 @@
 
 	if (ndisp NE 0)
-		return;
+		return(FAILURE);
 
 	ldswin(0);			/* fix up the title */
Index: ram/m7menu.c
===================================================================
--- ram/m7menu.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/m7menu.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -42,5 +42,7 @@
 extern	void	(*point)(short x, short y, short pen);
 
-extern	short	nokey(void);
+extern	void	nokey(void);
+extern	void	nodkey(short k);
+extern	short	nonf(short k);
 extern	void	select(void);
 extern	void	cxkstd(void);
@@ -253,6 +255,6 @@
 	select,			/* e_key */
 	nokey,			/* m_key */
-	nokey,			/* d_key */
-	nokey,			/* not_fld */
+	nodkey,			/* d_key */
+	nonf,			/* not_fld */
 	(struct fet *)NULL,	/* curfet */
 	mdboxes,		/* csbp */
Index: ram/msl.c
===================================================================
--- ram/msl.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/msl.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -58,10 +58,10 @@
 extern	void	(*cx_key)(void);
 extern	void	(*cy_key)(void);
-extern	void	(*d_key)(void);
+extern	void	(*d_key)(short k);
 extern	void	(*e_key)(void);
 extern	void	(*m_key)(void);
 extern	void	(*x_key)(void);
 
-extern	PFS	(*swpt)[];
+extern	LPF	(*swpt)[];
 
 extern	short	aflag;
@@ -373,5 +373,5 @@
 				} else if ((asig GE 60) AND (asig LE 69)) {
 
-					(*d_key)();
+					(*d_key)(asig - 60);
 
 /* 
Index: ram/ptdkey.c
===================================================================
--- ram/ptdkey.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/ptdkey.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -559,5 +559,5 @@
 */
 
-void ptdkey(void)
+void ptdkey(short k)
 {
 	register short key, val, vg;
Index: ram/ptfield.c
===================================================================
--- ram/ptfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/ptfield.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -44,15 +44,16 @@
 
 extern	void	select(void);
-extern	short	nokey(void);
+extern	void	nokey(void);
+extern	short	nonf(short k);
 extern	short	stdctp5(void);
 extern	void	cxkstd(void);
 extern	void	cykstd(void);
 extern	void	stdmkey(void);
-extern	void	stddkey(void);
+extern	void	stddkey(short k);
 extern	void	stopcm(void);
 extern	void	smxupd(void);
 extern	void	smyupd(void);
 extern	void	aftercm(void);
-extern	void	ptdkey(void);
+extern	void	ptdkey(short k);
 
 extern	short	astat;
@@ -135,5 +136,5 @@
 	ptmkey,			/* m_key */
 	ptdkey,			/* d_key */
-	nokey,			/* not_fld */
+	nonf,			/* not_fld */
 	(struct fet *)NULL,	/* curfet */
 	ptboxes,		/* csbp */
Index: ram/ptselbx.c
===================================================================
--- ram/ptselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/ptselbx.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -43,6 +43,4 @@
 */
 
-extern	void	enterit(void);
-extern	short	nokey(void);
 extern	short	cnvp2c(void);
 extern	short	dec2fr(char *s);
Index: ram/scfield.c
===================================================================
--- ram/scfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/scfield.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -31,12 +31,11 @@
 extern	short	oktode(struct s_entry *ep);
 extern	short	stdctp3(void);
-extern	void	enterit(void);
-extern	void	stddkey(void);
-extern	short	nokey(void);
+extern	void	stddkey(short k);
+extern	void	nokey(void);
 extern	void	stdmkey(void);
 
-extern	short	et_strn(void);
-extern	short	ef_strn(void);
-extern	short	rd_strn(void);
+extern	short	et_strn(short n);
+extern	short	ef_strn(short n);
+extern	short	rd_strn(short n);
 extern	short	nd_strn(short n, short k);
 extern	short	et_snbt(short n);
@@ -96,15 +95,15 @@
 extern	short	nd_agrp(short n, short k);
 
-extern	short	et_scor(void);
-extern	short	ef_scor(void);
-extern	short	rd_scor(void);
+extern	short	et_scor(short n);
+extern	short	ef_scor(short n);
+extern	short	rd_scor(short n);
 extern	short	nd_scor(short n, short k);
 
 /* forward references */
 
-short	et_null(void);
-short	ef_null(void);
-short	rd_null(void);
-short	nd_null(void);
+short	et_null(short n);
+short	ef_null(short n);
+short	rd_null(short n);
+short	nd_null(short n, short k);
 void	sdcxu(void);
 void	sdcyu(void);
@@ -164,6 +163,6 @@
 extern	short	varmode[8][16];
 
-extern	PFS	(*swpt)[];
-extern	PFS	(*oldsw)[];
+extern	LPF	(*swpt)[];
+extern	LPF	(*oldsw)[];
 
 extern	struct	fet	*cfetp;
@@ -341,20 +340,20 @@
 */
 
-short et_null(void)
+short et_null(short n)
 {
 	return(SUCCESS);
 }
 
-short ef_null(void)
+short ef_null(short n)
 {
 	return(SUCCESS);
 }
 
-short rd_null(void)
+short rd_null(short n)
 {
 	return(SUCCESS);
 }
 
-short nd_null(void)
+short nd_null(short n, short k)
 {
 	return(SUCCESS);
Index: ram/scope.c
===================================================================
--- ram/scope.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/scope.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -28,5 +28,8 @@
 char		scopebf[65];		/* scope display buffer */
 
-extern	short	nokey(void);
+extern	short	stdctp2(void);
+extern	void	nokey(void);
+extern	void	nodkey(short k);
+extern	short	nonf(short k);
 extern	void	stdmkey(void);
 
@@ -48,5 +51,5 @@
 struct curpak dt_flds = {
 
-	nokey,			/* curtype */
+	stdctp2,		/* curtype */
 	nokey,			/* premove */
 	nokey,			/* pstmove */
@@ -60,6 +63,6 @@
 	scptogl,		/* e_key */
 	stdmkey,		/* m_key */
-	nokey,			/* d_key */
-	nokey,			/* not_fld */
+	nodkey,			/* d_key */
+	nonf,			/* not_fld */
 	(struct fet *)NULL,	/* curfet */
 	(struct selbox *)NULL,	/* csbp */
Index: ram/scselbx.c
===================================================================
--- ram/scselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/scselbx.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -30,8 +30,8 @@
 /* functions defined elsewhere */
 
-extern	void	enterit(void);
+extern	short	entbh(short n);
 extern	void	advscur(void);
 extern	short	oktode(struct s_entry *ep);
-extern	short	nokey(void);
+extern	void	nokey(void);
 
 /* 
@@ -105,7 +105,7 @@
 extern	unsigned	*obj8, *obj11;
 
-extern	PFS	(*swpt)[];
-extern	PFS	(*oldsw)[];
-extern	PFS	t_ngrp[];
+extern	LPF	(*swpt)[];
+extern	LPF	(*oldsw)[];
+extern	LPF	t_ngrp[];
 
 extern	char	bfs[];
@@ -116,5 +116,5 @@
 /* forward references */
 
-void	sdboxfn(short n);
+short	sdboxfn(short n);
 void	bspscur(void);
 void	svtdsp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf);
@@ -225,6 +225,6 @@
 	{  0, 238, 111, 251,       4, sdboxfn},	/*  4 - Assignment */
 	{112, 238, 167, 251,       5, sdboxfn},	/*  5 - Tune */
-	{168, 238, 247, 251,       6, enterit},	/*  6 - Tempo */
-	{248, 238, 319, 251,       7, enterit},	/*  7 - Interpolate */
+	{168, 238, 247, 251,       6, entbh},	/*  6 - Tempo */
+	{248, 238, 319, 251,       7, entbh},	/*  7 - Interpolate */
 	{320, 238, 398, 251,       8, sdboxfn},	/*  8 - Stop/Next */
 	{400, 238, 455, 251,       9, sdboxfn},	/*  9 - In/Out */
@@ -1232,5 +1232,5 @@
 */
 
-void sdboxfn(short n)
+short sdboxfn(short n)
 {
 	register short	row, col, grp, what, i;
@@ -1248,5 +1248,5 @@
 
 			if (clkrun)		/* clock can't be running */
-				return;
+				return(FAILURE);
 
 			if (ac_code EQ N_SHARP)
@@ -1256,15 +1256,15 @@
 
 			sc_refr(fc_val);
-			return;
+			return(SUCCESS);
 
 		} else if ((col GE 2) AND (col LE 4)) {	/* section menu */
 
 			if (clkrun)		/* clock can't be running */
-				return;
+				return(FAILURE);
 
 			if (sdmctl EQ -1) {	/* menu not up yet */
 
 				sdmenu(4);	/* put up the menu */
-				return;
+				return(SUCCESS);
 /* 
 
@@ -1278,5 +1278,5 @@
 
 						hilitop(SOP_GO);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 8) AND
@@ -1284,5 +1284,5 @@
 
 						hilitop(SOP_MOV);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 15) AND
@@ -1290,5 +1290,5 @@
 
 						hilitop(SOP_STC);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 24) AND
@@ -1301,5 +1301,5 @@
 						}
 
-						return;
+						return(SUCCESS);
 					}
 /* 
@@ -1312,5 +1312,5 @@
 
 						hilitop(SOP_BGN);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 8) AND
@@ -1318,5 +1318,5 @@
 
 						hilitop(SOP_CPY);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 15) AND
@@ -1324,5 +1324,5 @@
 
 						hilitop(SOP_DGR);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 24) AND
@@ -1335,5 +1335,5 @@
 						}
 
-						return;
+						return(SUCCESS);
 					}
 /* 
@@ -1346,5 +1346,5 @@
 
 						hilitop(SOP_END);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 8) AND
@@ -1352,5 +1352,5 @@
 
 						hilitop(SOP_MRG);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 15) AND
@@ -1358,5 +1358,5 @@
 
 						hilitop(SOP_DEV);
-						return;
+						return(SUCCESS);
 					}
 
@@ -1370,5 +1370,5 @@
 
 						hilitop(SOP_GRP);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 15) AND
@@ -1376,5 +1376,5 @@
 
 						hilitop(SOP_RMV);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 28) AND
@@ -1387,5 +1387,5 @@
 							dsgtmn(gtmsel, TRUE);
 
-						return;
+						return(SUCCESS);
 					}
 
@@ -1397,21 +1397,18 @@
 						secop = SOP_NUL;
 						sdmenu(-1);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 22) AND
 						   (vtccol LE 24)) {	/* Transpose */
 
-						enterit();
-						return;
+						return(entbh(-1));
 					}
 				}
 			}
 
-			return;
-
-		} else {
-			enterit();
-			return;
-		}
+			return(FAILURE);
+
+		} else
+			return(entbh(-1));
 
 /* 
@@ -1431,5 +1428,5 @@
 
 		dsimode();			/* update insert mode display */
-		return;
+		return(SUCCESS);
 
 	case 2:		/* clock control, source */
@@ -1439,5 +1436,5 @@
 			clkset(NOT clkrun);
 			dsclk();
-			return;
+			return(SUCCESS);
 
 /* 
@@ -1449,5 +1446,5 @@
 
 				sdmenu(3);
-				return;
+				return(SUCCESS);
 
 			} else {		/* menu up */
@@ -1461,5 +1458,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 					}
 
@@ -1472,5 +1469,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 					}
 
@@ -1483,10 +1480,10 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 					}
 				}
 			}
 
-			return;
+			return(FAILURE);
 /* 
 
@@ -1498,5 +1495,5 @@
 				sdmenu(2);
 				setleds();
-				return;
+				return(SUCCESS);
 
 			} else {		/* menu up */
@@ -1512,5 +1509,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 9) AND
@@ -1522,5 +1519,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 17) AND
@@ -1533,5 +1530,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 					}
 
@@ -1549,5 +1546,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 9) AND
@@ -1559,5 +1556,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 					}
 /* 
@@ -1574,5 +1571,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 
 					} else if ((vtccol GE 9) AND
@@ -1584,5 +1581,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return;
+						return(SUCCESS);
 					}
 				}
@@ -1590,5 +1587,5 @@
 		}
 
-		return;
+		return(FAILURE);
 
 /* 
@@ -1598,5 +1595,5 @@
 
 		if (clkrun)		/* clock can't be running */
-			return;
+			return(FAILURE);
 
 		if (scmctl NE -1)
@@ -1607,5 +1604,5 @@
 			sdmenu(1);
 			noteop = NOP_NUL;
-			return;
+			return(SUCCESS);
 
 		} else {		/* menu up - select operation */
@@ -1617,5 +1614,5 @@
 
 					hilitnt(NOP_ACC);
-					return;
+					return(SUCCESS);
 
 				} else if ((vtccol GE 13) AND
@@ -1623,5 +1620,5 @@
 
 					hilitnt(NOP_MVN);
-					return;
+					return(SUCCESS);
 
 				} else if ((vtccol GE 25) AND
@@ -1629,9 +1626,9 @@
 
 					hilitnt(NOP_NUL);
-					return;
+					return(SUCCESS);
 
 				}
 
-				return;
+				return(FAILURE);
 /* 
 
@@ -1643,5 +1640,5 @@
 
 					hilitnt(NOP_NAT);
-					return;
+					return(SUCCESS);
 
 				} else if ((vtccol GE 13) AND
@@ -1649,8 +1646,8 @@
 
 					hilitnt(NOP_MVB);
-					return;
+					return(SUCCESS);
 				}
 
-				return;
+				return(FAILURE);
 
 			} else if (vtcrow EQ 21) {
@@ -1660,5 +1657,5 @@
 
 					hilitnt(NOP_END);
-					return;
+					return(SUCCESS);
 
 				} else if ((vtccol GE 13) AND
@@ -1666,14 +1663,14 @@
 
 					hilitnt(NOP_MVE);
-					return;
+					return(SUCCESS);
 				}
 
-				return;
+				return(FAILURE);
 
 			} else
-				return;
+				return(FAILURE);
 		}
 
-		return;
+		return(FAILURE);
 
 /* 
@@ -1703,10 +1700,9 @@
 			}
 
-			return;
+			return(SUCCESS);
 
 		} else {
 
-			enterit();	/* data entry */
-			return;
+			return(entbh(-1));	/* data entry */
 		}
 
@@ -1720,10 +1716,9 @@
 				scmenu(-1);	/* take down menu */
 
-			return;
+			return(SUCCESS);
 
 		} else {
 
-			enterit();	/* data entry */
-			return;
+			return(entbh(-1));	/* data entry */
 		}
 /* 
@@ -1780,5 +1775,5 @@
 		}
 
-		return;
+		return(SUCCESS);
 
 /* 
@@ -1837,5 +1832,5 @@
 		}
 
-		return;
+		return(SUCCESS);
 /* 
 
@@ -1843,5 +1838,5 @@
 	case 10:	/* Output */
 
-		return;
+		return(SUCCESS);
 
 	case 11:	/* group/ins, trans, dyn/loc, velocity */
@@ -1854,5 +1849,5 @@
 				scmenu(-1);	/* take down the menu */
 
-			return;
+			return(SUCCESS);
 
 		} else if ((row EQ 21) AND (col LE 3)) {	/* velocity flag */
@@ -1860,10 +1855,8 @@
 			velflag = NOT velflag;
 			ds_vmod();
-			return;
-
-		} else {
-			enterit();			/* inst. number */
-			return;
-		}
+			return(SUCCESS);
+
+		} else
+			return(entbh(-1));			/* inst. number */
 
 /* 
@@ -1887,5 +1880,5 @@
 				vputa(obj8, 7, i, atr);
 
-			return;
+			return(SUCCESS);
 
 		} else if ((row EQ 22) AND (col LE 4)) {	/* r/p source */
@@ -1904,10 +1897,9 @@
 				vputa(obj8, 6, i, atr);
 
-			return;
+			return(SUCCESS);
 
 		} else {
 
-			enterit();
-			return;
+			return(entbh(-1));
 		}
 /* 
@@ -1923,5 +1915,5 @@
 				scmenu(-1);	/* take down menu */
 
-			return;
+			return(SUCCESS);
 
 		} else if ((col GE 10) AND (col LE 25)) {	/* score name */
@@ -1940,10 +1932,8 @@
 			}
 
-			return;
-
-		} else {
-			enterit();
-			return;
-		}
+			return(SUCCESS);
+
+		} else
+			return(entbh(-1));
 /* 
 
@@ -1955,5 +1945,5 @@
 			recsw = FALSE;
 			dsrpmod();
-			return;
+			return(SUCCESS);
 
 		} else if ((col GE 36) AND (col LE 40)) {	/* Recrd */
@@ -1961,5 +1951,5 @@
 			recsw = TRUE;
 			dsrpmod();
-			return;
+			return(SUCCESS);
 
 		} else if ((col GE 42) AND (col LE 47)) {	/* OvrDub */
@@ -1967,5 +1957,5 @@
 			dubsw = NOT dubsw;
 			dsrpmod();
-			return;
+			return(SUCCESS);
 
 		} else if ((col GE 49) AND (col LE 55)) {	/* PunchIn */
@@ -1973,9 +1963,9 @@
 			pchsw = NOT pchsw;
 			dsrpmod();
-			return;
+			return(SUCCESS);
 
 		}
 
-		return;
+		return(FAILURE);
 
 	case 16:	/* note display */
@@ -1984,6 +1974,7 @@
 			donote();
 
-		return;
+		return(SUCCESS);
 	}
+
+	return(FAILURE);
 }
-
Index: ram/showcfg.c
===================================================================
--- ram/showcfg.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/showcfg.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -35,5 +35,5 @@
 extern	void	enterit(void);
 extern	void	idpoint(short x, short y, short pen);
-extern	short	nokey(void);
+extern	void	nokey(void);
 
 extern	short	et_mcfn(short n);
@@ -48,5 +48,5 @@
 /* forward references */
 
-void	imfnbox(short n);
+short	imfnbox(short n);
 
 /* 
@@ -612,5 +612,5 @@
 */
 
-void imfnbox(short n)
+short imfnbox(short n)
 {
 	register short row, col;
@@ -638,5 +638,5 @@
 
 				wcmenu(1);
-				return;
+				return(SUCCESS);
 
 			} else {			/* data entry */
@@ -648,5 +648,5 @@
 					modinst();
 
-				return;
+				return(SUCCESS);
 			}
 /* 
@@ -668,7 +668,9 @@
 					modinst();
 
-				return;
+				return(SUCCESS);
 			}
 		}
 	}
+
+	return(FAILURE);
 }
Index: ram/sqdisp.c
===================================================================
--- ram/sqdisp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/sqdisp.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -23,5 +23,5 @@
 #endif
 
-extern	short	nokey(void);
+extern	void	nokey(void);
 
 extern	char	*(*BakLine)(void);
Index: ram/sqdkey.c
===================================================================
--- ram/sqdkey.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/sqdkey.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -388,5 +388,5 @@
 */
 
-void sqdkey(void)
+void sqdkey(short k)
 {
 	register short key;
Index: ram/sqfield.c
===================================================================
--- ram/sqfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/sqfield.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -33,10 +33,11 @@
 
 extern	void	select(void);
-extern	short	nokey(void);
+extern	void	nokey(void);
+extern	short	nonf(short k);
 extern	short	stdctp5(void);
 extern	void	cxkstd(void);
 extern	void	cykstd(void);
 extern	void	stdmkey(void);
-extern	void	stddkey(void);
+extern	void	stddkey(short k);
 extern	void	stopsm(void);
 extern	void	smxupd(void);
@@ -73,5 +74,5 @@
 void	sqekey(void);
 void	sqmkey(void);
-void	sqdkey(void);
+void	sqdkey(short k);
 
 /* 
@@ -94,5 +95,5 @@
 	sqmkey,			/* m_key */
 	sqdkey,			/* d_key */
-	nokey,			/* not_fld */
+	nonf,			/* not_fld */
 	(struct fet *)NULL,	/* curfet */
 	sqboxes,		/* csbp */
Index: ram/swinit.c
===================================================================
--- ram/swinit.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/swinit.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -35,8 +35,8 @@
 BOOL	se_chg;			/* Score free list changed flag */
 
-PFS	(*oldsw)[];		/* saved swpt value */
-PFS	(*swpt)[];		/* switch dispatch table pointer */
-
-PFS	aswtbl[14];		/* assignment switch table */
+LPF	(*oldsw)[];		/* saved swpt value */
+LPF	(*swpt)[];		/* switch dispatch table pointer */
+
+LPF	aswtbl[14];		/* assignment switch table */
 
 void	(*curmove)(void);	/* cursor move function */
@@ -46,11 +46,11 @@
 void	(*cy_key)(void);	/* y rate calculation */
 void	(*cy_upd)(void);	/* y update */
-void	(*d_key)(void);		/* in-field data key processor */
+void	(*d_key)(short k);	/* in-field data key processor */
 void	(*e_key)(void);		/* E key processor */
 void	(*m_key)(void);		/* M key processor */
 void	(*itxput)(short row, short col, char *txt, short tag);
 				/* instrument menu text put function */
-void	(*not_fld)(short k);	/* not-in-field data key processor */
-void	(*olddkey)(void);	/* saved d_key value */
+short	(*not_fld)(short k);	/* not-in-field data key processor */
+void	(*olddkey)(short k);	/* saved d_key value */
 void	(*oldekey)(void);	/* saved e_key value */
 void	(*oldmkey)(void);	/* saved m_key value */
Index: ram/tdfield.c
===================================================================
--- ram/tdfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/tdfield.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -19,15 +19,16 @@
 extern	void	select(void);
 extern	short	whatbox(void);
-extern	short	nokey(void);
+extern	void	nokey(void);
+extern	short	nonf(short k);
 extern	short	stdctp0(void);
 extern	void	cxkstd(void);
 extern	void	cykstd(void);
 extern	void	stdmkey(void);
-extern	void	stddkey(void);
-
-extern	short	et_null(void);
-extern	short	ef_null(void);
-extern	short	rd_null(void);
-extern	short	nd_null(void);
+extern	void	stddkey(short k);
+
+extern	short	et_null(short n);
+extern	short	ef_null(short n);
+extern	short	rd_null(short n);
+extern	short	nd_null(short n, short k);
 extern	short	et_ttab(short n);
 extern	short	ef_ttab(short n);
@@ -260,5 +261,5 @@
 	stdmkey,	/* m_key */
 	stddkey,	/* d_key */
-	nokey,		/* not_fld */
+	nonf,		/* not_fld */
 	td_fet1,	/* curfet */
 	tdboxes,	/* csbp */
Index: ram/tdselbx.c
===================================================================
--- ram/tdselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/tdselbx.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -19,5 +19,5 @@
 extern	void	bsptcur(void);
 extern	void	vtdisp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf);
-extern	short	nokey(void);
+extern	void	nokey(void);
 
 extern	unsigned	exp_c(unsigned c);
Index: ram/wdselbx.c
===================================================================
--- ram/wdselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
+++ ram/wdselbx.c	(revision 60288f548947383de9a52a06e402df2698a3ce5d)
@@ -19,5 +19,5 @@
 #include "wsdsp.h"
 
-extern	void	enterit(void);
+extern	short	entbh(short n);
 extern	void	wdswin(short n);
 
@@ -57,8 +57,8 @@
 	{  1,   1, 510, 307,      0, wdfnbox},	/*  0 */
 	{  1, 308, 510, 320,      1, wdfnbox},	/*  1 */
-	{  1, 322, 174, 348,      2, enterit},	/*  2 */
+	{  1, 322, 174, 348,      2, entbh},	/*  2 */
 	{176, 322, 230, 348,      3, wdfnbox},	/*  3 */
-	{232, 322, 398, 348,      4, enterit},	/*  4 */
-	{400, 322, 510, 348,      5, enterit},	/*  5 */
+	{232, 322, 398, 348,      4, entbh},	/*  4 */
+	{400, 322, 510, 348,      5, entbh},	/*  5 */
 
 	{  0,   0,   0,   0,	  0, FN_NULL}		/* end of table */