diff --git a/src/cas/generic/casdef.h b/src/cas/generic/casdef.h
index 824c8f7bd..f3634e8e7 100644
--- a/src/cas/generic/casdef.h
+++ b/src/cas/generic/casdef.h
@@ -30,6 +30,9 @@
  * 	Modification Log:
  * 	-----------------
  * 	$Log$
+ * 	Revision 1.5  1996/08/13 22:54:42  jhill
+ * 	doc
+ *
  * 	Revision 1.4  1996/07/01 19:56:15  jhill
  * 	one last update prior to first release
  *
@@ -252,6 +255,8 @@ public:
 	}
 };
 
+class caServerI;
+
 //
 // caServer - Channel Access Server API Class
 //
@@ -271,10 +276,6 @@ public:
                                 unsigned maxSimultaneousIO=1u);
 	virtual ~caServer();
 
-	//
-	// Need VF that returns pointer to derived type ?
-	//
-
 	//caStatus enableClients ();
 	//caStatus disableClients ();
 
@@ -542,5 +543,5 @@ public:
 	casPV *getPV();
 };
 
-#endif /* ifdef includecasdefh (this must be the last line in this file) */
+#endif // ifdef includecasdefh (this must be the last line in this file) 
 
diff --git a/src/cas/generic/outBuf.cc b/src/cas/generic/outBuf.cc
index 1fa959491..85a79dea0 100644
--- a/src/cas/generic/outBuf.cc
+++ b/src/cas/generic/outBuf.cc
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.2  1996/08/13 22:53:59  jhill
+ * fixed little endian problem
+ *
  * Revision 1.1.1.1  1996/06/20 00:28:15  jhill
  * ca server installation
  *
@@ -172,6 +175,7 @@ void outBuf::commitMsg ()
 	 */
 	mp->m_cmmd = htons (mp->m_cmmd);
 	mp->m_postsize = htons (mp->m_postsize);
+	mp->m_type = htons (mp->m_type);
 	mp->m_count = htons (mp->m_count);
 	mp->m_cid = htonl (mp->m_cid);
 	mp->m_available = htonl (mp->m_available);
diff --git a/src/cas/generic/server.h b/src/cas/generic/server.h
index 59fa35e1a..5e6d0d72e 100644
--- a/src/cas/generic/server.h
+++ b/src/cas/generic/server.h
@@ -29,6 +29,9 @@
  *
  * History
  * $Log$
+ * Revision 1.9  1996/08/13 22:56:14  jhill
+ * added init for mutex class
+ *
  * Revision 1.8  1996/08/05 23:22:58  jhill
  * gddScaler => gddScalar
  *
@@ -75,21 +78,13 @@ HDRVERSIONID(serverh, "%W% %G%")
 //
 // ANSI C
 //
-#include <stddef.h>
-#include <string.h>
 #include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <math.h>
-#include <limits.h>
 
 //
 // EPICS
 //
 #define	 epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 #include <epicsAssert.h>
-#include <db_access.h>
 
 //
 // CA
@@ -99,20 +94,13 @@ HDRVERSIONID(serverh, "%W% %G%")
 #include <casdef.h>
 #include <osiTime.h>
 
-//
-// gdd
-//
-#if 0
-#include <dbMapper.h>
-#include <gddApps.h>
-#endif
-
 //
 // CAS
 //
 void casVerifyFunc(const char *pFile, unsigned line, const char *pExp);
-void serverToolDebugFunc(const char *pFile, unsigned line);
-#define serverToolDebug() {serverToolDebugFunc(__FILE__, __LINE__); } 
+void serverToolDebugFunc(const char *pFile, unsigned line, const char *pComment);
+#define serverToolDebug(COMMENT) \
+{serverToolDebugFunc(__FILE__, __LINE__, COMMENT); } 
 #define casVerify(EXP) {if ((EXP)==0) casVerifyFunc(__FILE__, __LINE__, #EXP); } 
 caStatus createDBRDD(unsigned dbrType, aitIndex dbrCount, gdd *&pDescRet);
 caStatus copyBetweenDD(gdd &dest, gdd &src);
@@ -893,10 +881,8 @@ private:
 
 class casClientMon;
 
-//
-// caServerI
-//
-class caServerI : public caServerOS, public caServerIO, 
+class caServerI : 
+	public caServerOS, public caServerIO, 
 	public osiMutex, public ioBlockedList,
 	private uintResTable<casRes>,
 	public casEventRegistry {
@@ -983,7 +969,7 @@ public:
 		return &this->adapter; 
 	}
 
-	uintResTable<casRes> &getResTable() {return *this;}
+	//uintResTable<casRes> &getResTable() {return *this;}
 
 	void installItem(casRes &res)
 	{