diff --git a/README.md b/README.md
index 0d1dd8d..135ffb8 100644
--- a/README.md
+++ b/README.md
@@ -15,16 +15,17 @@ TODO list:<br />
 <ul>
   <li>WORD in RECORD to SMALLWORD</li>
   <li>INTEGER in RECORD to SMALLINT</li>
-  <li>TYPEs of OF WORD to OF SMALLWORD (just in case they're used in a RECORD)</li>
-  <li>TYPEs of OF INTEGER to OF SMALLINT (just in case they're used in a RECORD)</li>
   <li>Implement any REETODOs that appear in compiled executables</li>
   <li>Anything passing 0 for the Attr parameter to FindFirst should pass AnyFile instead (VP returns no files when 0 is passed for Attr)</li>
   <li>Investigate FILEMODE usage to see if FILEMODEREADWRITE, TEXTMODEREAD or TEXTMODEREADWRITE should be used</li>
   <li>Find/correct any usage of FOR loop variables after the loop (since they are 1 greater in VP than in BP</li>
+  <li>Find/correct any file i/o on untyped files where Words or LongInts are being read</li>
 </ul>
 
 Completed list<br />
 <ul>
   <li>IFDEF out anything that doesn't compile and make a WIN32 placeholder that does a "WriteLn('REETODO UNIT FUNCTION'); Halt;" (then you can grep the executables for REETODO to see which REETODOs actually need to be implemented)</li>
   <li>IFDEF out any ASM code blocks and handle the same as above</li>
+  <li>TYPEs of OF WORD to OF SMALLWORD (just in case they're used in a RECORD)</li>
+  <li>TYPEs of OF INTEGER to OF SMALLINT (just in case they're used in a RECORD)</li>
 </ul>
diff --git a/SOURCE/COMMON.PAS b/SOURCE/COMMON.PAS
index cc07a9b..14d0ce8 100644
--- a/SOURCE/COMMON.PAS
+++ b/SOURCE/COMMON.PAS
@@ -161,7 +161,7 @@ TYPE
 
   ConferenceKeyType = SET OF '@'..'Z';
 
-  CompArrayType = ARRAY[0..1] OF INTEGER;
+  CompArrayType = ARRAY[0..1] OF SMALLINT;
 
 CONST
   MCIBuffer: MCIBufferPtr = NIL;
diff --git a/SOURCE/EMAIL.PAS b/SOURCE/EMAIL.PAS
index 23477a5..0d835ec 100644
--- a/SOURCE/EMAIL.PAS
+++ b/SOURCE/EMAIL.PAS
@@ -671,7 +671,7 @@ END;
 
 PROCEDURE ReadMail;
 TYPE
-  MessageArrayType = ARRAY [1..255] OF Word;
+  MessageArrayType = ARRAY [1..255] OF SmallWord;
 VAR
   MessageArray: MessageArrayType;
   User: UserRecordType;
diff --git a/SOURCE/FILE11.PAS b/SOURCE/FILE11.PAS
index 9140265..58edd95 100644
--- a/SOURCE/FILE11.PAS
+++ b/SOURCE/FILE11.PAS
@@ -50,7 +50,7 @@ USES
   TimeFunc;
 
 TYPE
-  DownLoadArrayType = ARRAY [0..99] OF Integer;
+  DownLoadArrayType = ARRAY [0..99] OF SmallInt;
 
 VAR
   DLArray: DownloadArrayType;
diff --git a/SOURCE/RECORDS.PAS b/SOURCE/RECORDS.PAS
index b7d8b79..613809d 100644
--- a/SOURCE/RECORDS.PAS
+++ b/SOURCE/RECORDS.PAS
@@ -46,6 +46,10 @@ CONST
   User_Phone_None = '';           {None for user phone fields}
 
 TYPE
+{$IFDEF MSDOS}
+  SmallInt = Integer;
+  SmallWord = Word;
+{$ENDIF}
   AStr = STRING[160];
   Str1 = STRING[1];
   Str2 = STRING[2];
diff --git a/SOURCE/RENEMAIL.PAS b/SOURCE/RENEMAIL.PAS
index fcce515..2749895 100644
--- a/SOURCE/RENEMAIL.PAS
+++ b/SOURCE/RENEMAIL.PAS
@@ -68,7 +68,7 @@ VAR
 
   FidoFile: FILE;
 
-  HiWaterF: FILE OF Word;
+  HiWaterF: FILE OF SmallWord;
 
   General: GeneralRecordType;
 
@@ -719,7 +719,7 @@ END;
 PROCEDURE GetMsgLst(MemMsgPath: STRING; VAR LowMsg,HighMsg: Word);
 VAR
   FidoMsgNum,
-  HiWater: Word;
+  HiWater: SmallWord;
 BEGIN
   HiWater := 1;
   IF (NOT IsNetMail) THEN
@@ -797,7 +797,7 @@ BEGIN
       LowMsg := 2;
 END;
 
-PROCEDURE UpdateHiWater(MemMsgPath: STRING; HighWater: Word);
+PROCEDURE UpdateHiWater(MemMsgPath: STRING; HighWater: SmallWord);
 BEGIN
   Assign(HiWaterF,MemMsgPath+'HI_WATER.MRK');
   {$I-} ReWrite(HiWaterF); {$I+}