diff --git a/Ace.Macs.S b/Ace.Macs.S
index c86d2d3..8035ea4 100644
--- a/Ace.Macs.S
+++ b/Ace.Macs.S
@@ -5,7 +5,6 @@
 ; and Roger Wagner Publishing, Inc. 1988
 ; All Rights Reserved
 ;
-
 _ACEBootInit MAC
  Tool $11D
  <<<
@@ -53,3 +52,13 @@ _ACECompBegin MAC
 _ACEExpBegin MAC
  Tool $C1D
  <<<
+~GetACEExpState MAC
+ PHL ]1
+_GetACEExpState MAC
+ Tool $D1D
+ <<<
+~SetACEExpState MAC
+ PHL ]1
+_SetACEExpState MAC
+ Tool $E1D
+ <<<
diff --git a/Ctl.Macs.S b/Ctl.Macs.S
index 5d1376f..9bb9636 100644
--- a/Ctl.Macs.S
+++ b/Ctl.Macs.S
@@ -11,11 +11,9 @@ _CtlBootInit MAC
 ~CtlStartUp MAC
  PxW ]1;]2
 _CtlStartUp MAC
-_InitCtrlMgr MAC
  Tool $210
  <<<
 _CtlShutDown MAC
-_CtrlShutDown MAC
  Tool $310
  <<<
 ~CtlVersion MAC
@@ -185,3 +183,116 @@ _EraseControl MAC
 _DrawOneCtl MAC
  Tool $2510
  <<<
+~FindTargetCtl MAC
+ PHS 2
+_FindTargetCtl MAC
+ Tool $2610
+ <<<
+~MakeNextCtlTarget MAC
+ PHS 2
+_MakeNextCtlTarget MAC
+ Tool $2710
+ <<<
+~MakeThisCtlTarget MAC
+ PHL ]1
+_MakeThisCtlTarget MAC
+ Tool $2810
+ <<<
+~SendEventToCtl MAC
+ P1SW ]1
+ PxL ]2;]3
+_SendEventToCtl MAC
+ Tool $2910
+ <<<
+~GetCtlID MAC
+ P2SL ]1
+_GetCtlID MAC
+ Tool $2A10
+ <<<
+~SetCtlID MAC
+ PxL ]1;]2
+_SetCtlID MAC
+ Tool $2B10
+ <<<
+~CallCtlDefProc MAC
+ PHLW ]1;]2
+ PHL ]3
+_CallCtlDefProc MAC
+ Tool $2C10
+ <<<
+~NotifyCtls MAC
+ PxW ]1;]2
+ PxL ]3;]4
+_NotifyCtls MAC
+ Tool $2D10
+ <<<
+~GetCtlMoreFlags MAC
+ P1SL ]1
+_GetCtlMoreFlags MAC
+ Tool $2E10
+ <<<
+~SetCtlMoreFlags MAC
+ PHWL ]1;]2
+_SetCtlMoreFlags MAC
+ Tool $2F10
+ <<<
+~GetCtlHandleFromID MAC
+ PHS 2
+ PxL ]1;]2
+_GetCtlHandleFromID MAC
+ Tool $3010
+ <<<
+~NewControl2 MAC
+ P2SL ]1
+ PHWL ]2;]3
+_NewControl2 MAC
+ Tool $3110
+ <<<
+~CMLoadResource MAC
+ P2SW ]1
+ PHL ]2
+_CMLoadResource MAC
+ Tool $3210
+ <<<
+~CMReleaseResource MAC
+ PHWL ]1;]2
+_CMReleaseResource MAC
+ Tool $3310
+ <<<
+~SetCtlParamPtr MAC
+ PHL ]1
+_SetCtlParamPtr MAC
+ Tool $3410
+ <<<
+~GetCtlParamPtr MAC
+ PHS 2
+_GetCtlParamPtr MAC
+ Tool $3510
+ <<<
+~InvalCtls MAC
+ PHL ]1
+_InvalCtls MAC
+ Tool $3710
+ <<<
+~FindRadioButton MAC
+ P1SL ]1
+ PHW ]2
+_FindRadioButton MAC
+ Tool $3910
+ <<<
+~SetLETextByID MAC
+ PxL ]1;]2;]3
+_SetLETextByID MAC
+ Tool $3A10
+ <<<
+~GetLETextByID MAC
+ PxL ]1;]2;]3
+_GetLETextByID MAC
+ Tool $3B10
+ <<<
+
+~qCtlStartUp MAC
+ PHW ]1
+ NextDP ]2;$100
+ Tool $210
+ <<<
diff --git a/Desk.Macs.S b/Desk.Macs.S
index 0381aed..43de97c 100644
--- a/Desk.Macs.S
+++ b/Desk.Macs.S
@@ -108,3 +108,41 @@ _CloseAllNDAs MAC
 _FixAppleMenu MAC
  Tool $1E05
  <<<
+~AddToRunQ MAC
+ PHL ]1
+_AddToRunQ MAC
+ Tool $1F05
+ <<<
+~RemoveFromRunQ MAC
+ PHL ]1
+_RemoveFromRunQ MAC
+ Tool $2005
+ <<<
+~RemoveCDA MAC
+ PHL ]1
+_RemoveCDA MAC
+ Tool $2105
+ <<<
+~RemoveNDA MAC
+ PHL ]1
+_RemoveNDA MAC
+ Tool $2205
+ <<<
+~GetDeskAccInfo MAC
+ PHWL ]1;]2
+ PHWL ]3;]4
+_GetDeskAccInfo MAC
+ Tool $2305
+ <<<
+~CallDeskAcc MAC
+ PHA
+ PHWL ]1;]2
+ PHWL ]3;]4
+_CallDeskAcc MAC
+ Tool $2405
+ <<<
+~GetDeskGlobal MAC
+ P2SW ]1
+_GetDeskGlobal MAC
+ Tool $2505
+ <<<
diff --git a/Event.Macs.S b/Event.Macs.S
index 0670852..bf6d158 100644
--- a/Event.Macs.S
+++ b/Event.Macs.S
@@ -120,3 +120,24 @@ _SetEventMask MAC
 _FakeMouse MAC
  Tool $1906
  <<<
+~SetAutoKeyLimit MAC
+ PHW ]1
+_SetAutoKeyLimit MAC
+ Tool $1A06
+ <<<
+~GetKeyTranslation MAC
+ P1SW ]1
+_GetKeyTranslation MAC
+ Tool $1B06
+ <<<
+~SetKeyTranslation MAC
+ PHW ]1
+_SetKeyTranslation MAC
+ Tool $1C06
+ <<<
+~qEMStartUp MAC
+ NextDP ]1;$100
+ PxW ]2;]3;]4;]5
+ PxW ]6;]7
+ Tool $206
+ <<<
diff --git a/Font.Macs.S b/Font.Macs.S
index 403e8f5..bcc7b3e 100644
--- a/Font.Macs.S
+++ b/Font.Macs.S
@@ -134,3 +134,8 @@ _FamNum2ItemID MAC
 _InstallWithStats MAC
  Tool $1C1B
  <<<
+~qFMStartUp MAC
+ PHW ]1
+ NextDP ]2;$100
+ Tool $21B
+ <<<
diff --git a/Int.Macs.S b/Int.Macs.S
index af01918..5474ef1 100644
--- a/Int.Macs.S
+++ b/Int.Macs.S
@@ -9,11 +9,9 @@ _IMBootInit MAC
  Tool $10B
  <<<
 _IMStartUp MAC
-_IntStartUp MAC
  Tool $20B
  <<<
 _IMShutDown MAC
-_IntShutDown MAC
  Tool $30B
  <<<
 ~IMVersion MAC
@@ -179,13 +177,13 @@ _Long2Hex MAC
  <<<
 ~Hex2Int MAC
  PHA
- PHLW ]2;]3
+ PHLW ]1;]2
 _Hex2Int MAC
  Tool $240B
  <<<
 ~Hex2Long MAC
  PHS 2
- PHLW ]2;]3
+ PHLW ]1;]2
 _Hex2Long MAC
  Tool $250B
  <<<
diff --git a/Line.Macs.S b/Line.Macs.S
index d86891b..c47ef68 100644
--- a/Line.Macs.S
+++ b/Line.Macs.S
@@ -167,3 +167,13 @@ _LEGetTextHand MAC
 _LEGetTextLen MAC
  Tool $2314
  <<<
+~GetLEDefProc MAC
+ PHS 2
+_GetLEDefProc MAC
+ Tool $2414
+ <<<
+~qLEStartUp MAC
+ PHW ]1
+ NextDP ]2;$100
+ Tool $214
+ <<<
diff --git a/List.Macs.S b/List.Macs.S
index b6a84da..fd4f5f7 100644
--- a/List.Macs.S
+++ b/List.Macs.S
@@ -69,3 +69,48 @@ _ResetMember MAC
 _NewList MAC
  Tool $101C
  <<<
+~DrawMember2 MAC
+ PHWL ]1;]2
+_DrawMember2 MAC
+ Tool $111C
+ <<<
+~NextMember2 MAC
+ PHA
+ PHWL ]1;]2
+_NextMember2 MAC
+ Tool $121C
+ <<<
+~ResetMember2 MAC
+ P1SL ]1
+_ResetMember2 MAC
+ Tool $131C
+ <<<
+~SelectMember2 MAC
+ PHWL ]1;]2
+_SelectMember2 MAC
+ Tool $141C
+ <<<
+~SortList2 MAC
+ PxL ]1;]2
+_SortList2 MAC
+ Tool $151C
+ <<<
+~NewList2 MAC
+ PHL ]1
+ PxW ]2;]3;]4;]5
+ PHL ]6
+_NewList2 MAC
+ Tool $161C
+ <<<
+~ListKey MAC
+ PHWL ]1;]2
+ PHL ]3
+_ListKey MAC
+ Tool $171C
+ <<<
+~CompareStrings MAC
+ P1SW ]1
+ PxL ]2;]3
+_CompareStrings MAC
+ Tool $181C
+ <<<
diff --git a/Load.Macs.S b/Load.Macs.S
index 2ad2c53..c3217df 100644
--- a/Load.Macs.S
+++ b/Load.Macs.S
@@ -1,4 +1,4 @@
-* Load Manager macros
+* System Loader macros
 *   by Dave Klimas
 ;
 ; Copyright Apple Computer, Inc. 1986, 1987
@@ -29,11 +29,18 @@ _LoaderStatus MAC
  <<<
 ~InitialLoad MAC
  PHS 5
- PHW ]1
- PHLW ]2;]3
+ PHWL ]1;]2
+ PHW ]3
 _InitialLoad MAC
  Tool $911
  <<<
+~InitialLoad2 MAC
+ PHS 5
+ PHWL ]1;]2
+ PxW ]3;]4
+_InitialLoad2 MAC
+ Tool $2011
+ <<<
 ~Restart MAC
  PHS 5
  PHW ]1
@@ -75,15 +82,31 @@ _GetLoadSegInfo MAC
 _GetUserID MAC
  Tool $1011
  <<<
+~GetUserID2 MAC
+ P1SL ]1
+_GetUserID2 MAC
+ Tool $2111
+ <<<
 ~LGetPathname MAC
  PHS 2
  PxW ]1;]2
 _LGetPathname MAC
  Tool $1111
  <<<
-~UserShutdown MAC
+~LGetPathname2 MAC
+ PHS 2
+ PxW ]1;]2
+_LGetPathname2 MAC
+ Tool $2211
+ <<<
+~UserShutDown MAC
  PHA
  PxW ]1;]2
-_UserShutdown MAC
+_UserShutDown MAC
  Tool $1211
  <<<
+~RenamePathname MAC
+ PxL ]1;]2
+_RenamePathname MAC
+ Tool $1311
+ <<<
diff --git a/Locator.Macs.S b/Locator.Macs.S
index 1fad14f..7d46e38 100644
--- a/Locator.Macs.S
+++ b/Locator.Macs.S
@@ -104,3 +104,40 @@ _MessageCenter MAC
 _SetDefaultTPT MAC
  Tool $1601
  <<<
+~MessageByName MAC
+ PHS 2
+ PHWL ]1;]2
+ PxW ]3;]4
+_MessageByName MAC
+ Tool $1701
+ <<<
+~StartupTools MAC
+ PHS 2
+ PxW ]1;]2
+ PHL ]3
+_StartupTools MAC
+ Tool $1801
+ <<<
+~ShutdownTools MAC
+ PHWL ]1;]2
+_ShutdownTools MAC
+ Tool $1901
+ <<<
+~GetMsgHandle MAC
+ PHS 2
+ PHWL ]1;]2
+_GetMsgHandle MAC
+ Tool $1A01
+ <<<
+~AcceptRequests MAC
+ PHL ]1
+ PHWL ]2;]3
+_AcceptRequests MAC
+ Tool $1B01
+ <<<
+~SendRequest MAC
+ PxW ]1;]2
+ PxL ]3;]4;]5
+_SendRequest MAC
+ Tool $1C01
+ <<<
diff --git a/Media.Macs.S b/Media.Macs.S
new file mode 100644
index 0000000..5d2b5ec
--- /dev/null
+++ b/Media.Macs.S
@@ -0,0 +1,226 @@
+* Media Controller Macros
+*   by Dave Klimas
+;
+; Copyright Apple Computer, Inc. 1986, 1987
+; and Roger Wagner Publishing, Inc. 1988
+; All Rights Reserved
+;
+_MCBootInit MAC
+ Tool $126
+ <<<
+~MCStartUp MAC
+ PHW ]1
+_MCStartUp MAC
+ Tool $226
+ <<<
+_MCShutDown MAC
+ Tool $326
+ <<<
+~MCVersion MAC
+ PHA
+_MCVersion MAC
+ Tool $426
+ <<<
+_MCReset MAC
+ Tool $526
+ <<<
+~MCStatus MAC
+ PHA
+_MCStatus MAC
+ Tool $626
+ <<<
+~MCGetErrorMsg MAC
+ PHWL ]1;]2
+_MCGetErrorMsg MAC
+ Tool $926
+ <<<
+~MCLoadDriver MAC
+ PHW ]1
+_MCLoadDriver MAC
+ Tool $A26
+ <<<
+~MCUnLoadDriver MAC
+ PHW ]1
+_MCUnLoadDriver MAC
+ Tool $B26
+ <<<
+~MCTimeToBin MAC
+ P2SL ]1
+_MCTimeToBin MAC
+ Tool $C26
+~MCBinToTime MAC
+ P2SL ]1
+_MCBinToTime MAC
+ Tool $D26
+ <<<
+~MCGetTrackTitle MAC
+ PHLW ]1;]2
+ PHL ]3
+_MCGetTrackTitle MAC
+ Tool $E26
+ <<<
+~MCSetTrackTitle MAC
+ PHLW ]1;]2
+ PHL ]3
+_MCSetTrackTitle MAC
+ Tool $F26
+ <<<
+~MCGetProgram MAC
+ PxL ]1;]2
+_MCGetProgram MAC
+ Tool $1026
+ <<<
+~MCSetProgram MAC
+ PxL ]1;]2
+_MCSetProgram MAC
+ Tool $1126
+ <<<
+~MCGetDiscTitle MAC
+ PxL ]1;]2
+_MCGetDiscTitle MAC
+ Tool $1226
+ <<<
+~MCSetDiscTitle MAC
+ PxL ]1;]2
+_MCSetDiscTitle MAC
+ Tool $1326
+ <<<
+~MCDStartUp MAC
+ PHWL ]1;]2
+_MCDStartUp MAC
+ Tool $1426
+ <<<
+~MCDShutDown MAC
+ PHW ]1
+_MCDShutDown MAC
+ Tool $1526
+ <<<
+~MCGetFeatures MAC
+ P2SW ]1
+ PHW ]2
+_MCGetFeatures MAC
+ Tool $1626
+ <<<
+~MCPlay MAC
+ PHW ]1
+_MCPlay MAC
+ Tool $1726
+ <<<
+~MCPause MAC
+ PHW ]1
+_MCPause MAC
+ Tool $1826
+ <<<
+~MCSendRawData MAC
+ PHWL ]1;]2
+_MCSendRawData MAC
+ Tool $1926
+ <<<
+~MCGetStatus MAC
+ P1SW ]1
+ PHW ]2
+_MCGetStatus MAC
+ Tool $1A26
+ <<<
+~MCControl MAC
+ PxW ]1;]2
+_MCControl MAC
+ Tool $1B26
+ <<<
+~MCScan MAC
+ PxW ]1;]2
+_MCScan MAC
+ Tool $1C26
+ <<<
+~MCGetSpeeds MAC
+ PHWL ]1;]2
+_MCGetSpeeds MAC
+ Tool $1D26
+ <<<
+~MCSpeed MAC
+ PxW ]1;]2
+_MCSpeed MAC
+ Tool $1E26
+ <<<
+~MCStopAt MAC
+ PxW ]1;]2
+ PHL ]3
+_MCStopAt MAC
+ Tool $1F26
+ <<<
+~MCJog MAC
+ PxW ]1;]2
+ PHLW ]3;]4
+_MCJog MAC
+ Tool $2026
+ <<<
+~MCSearchTo MAC
+ PxW ]1;]2
+ PHL ]3
+_MCSearchTo MAC
+ Tool $2126
+ <<<
+~MCSearchDone MAC
+ P1SW ]1
+_MCSearchDone MAC
+ Tool $2226
+ <<<
+~MCSearchWait MAC
+ PHW ]1
+_MCSearchWait MAC
+ Tool $2326
+ <<<
+~MCGetPosition MAC
+ P2SW ]1
+ PHW ]2
+_MCGetPosition MAC
+ Tool $2426
+ <<<
+~MCSetAudio MAC
+ PxW ]1;]2
+_MCSetAudio MAC
+ Tool $2526
+ <<<
+~MCGetTimes MAC
+ P2SW ]1
+ PHW ]2
+_MCGetTimes MAC
+ Tool $2626
+ <<<
+~MCGetDiscTOC MAC
+ P2SW ]1
+ PHW ]2
+_MCGetDiscTOC MAC
+ Tool $2726
+ <<<
+~MCControl MAC
+ P2SW ]1
+_MCControl MAC
+ Tool $2826
+ <<<
+~MCGetNoTracks MAC
+ P1SW ]1
+_MCGetNoTracks MAC
+ Tool $2926
+ <<<
+~MCRecord MAC
+ PHW ]1
+_MCRecord MAC
+ Tool $2A26
+ <<<
+~MCStop MAC
+ PHW ]1
+_MCStop MAC
+ Tool $2B26
+ <<<
+~MCWaitRawData MAC
+ PHWL ]1;]2
+ PHW ]3
+_MCWaitRawData MAC
+ Tool $2C26
+ <<<
+~MCGetName MAC
+ PHWL ]1;]2
+_MCGetName MAC
+ Tool $2D26
+ <<<
diff --git a/Mem.Macs.S b/Mem.Macs.S
index 3b5ea16..a5c8c65 100644
--- a/Mem.Macs.S
+++ b/Mem.Macs.S
@@ -50,6 +50,16 @@ _ReallocHandle MAC
 _RestoreHandle MAC
  Tool $B02
  <<<
+~AddToOOMQueue MAC
+ PHL ]1
+_AddToOOMQueue MAC
+ Tool $C02
+ <<<
+~DeleteFromOOMQueue MAC
+ PHL ]1
+_DeleteFromOOMQueue MAC
+ Tool $D02
+ <<<
 ~DisposeHandle MAC
  PHL ]1
 _DisposeHandle MAC
@@ -163,3 +173,9 @@ _BlockMove MAC
 _RealFreeMem MAC
  Tool $2F02
  <<<
+~SetHandleID MAC
+ P1SW ]1
+ PHL ]2
+_SetHandleID MAC
+ Tool $3002
+ <<<
diff --git a/Menu.Macs.S b/Menu.Macs.S
index 47fcd18..44de389 100644
--- a/Menu.Macs.S
+++ b/Menu.Macs.S
@@ -272,3 +272,123 @@ _SetMenuBar MAC
 _SetMItemName MAC
  Tool $3A0F
  <<<
+~GetPopUpDefProc MAC
+ PHS 2
+_GetPopUpDefProc MAC
+ Tool $3B0F
+ <<<
+~PopUpMenuSelect MAC
+ PHA
+ PxW ]1;]2;]3;]4
+ PHL ]5
+_PopUpMenuSelect MAC
+ Tool $3C0F
+ <<<
+~DrawPopUp MAC
+ PxW ]1;]2;]3;]4
+ PxW ]5;]6;]7
+_DrawPopUp MAC
+ Tool $3D0F
+ <<<
+~NewMenu2 MAC
+ P2SW ]1
+ PHL ]2
+_NewMenu2 MAC
+ Tool $3E0F
+ <<<
+~InsertMItem2 MAC
+ PHWL ]1;]2
+ PxW ]3;]4
+_InsertMItem2 MAC
+ Tool $3F0F
+ <<<
+~SetMenuTitle2 MAC
+ PHWL ]1;]2
+ PHW ]3
+_SetMenuTitle2 MAC
+ Tool $400F
+ <<<
+~SetMItem2 MAC
+ PHWL ]1;]2
+ PHW ]3
+_SetMItem2 MAC
+ Tool $410F
+ <<<
+~SetMItemName2 MAC
+ PHWL ]1;]2
+ PHW ]3
+_SetMItemName2 MAC
+ Tool $420F
+ <<<
+~NewMenuBar2 MAC
+ P2SW ]1
+ PxL ]2;]3
+_NewMenuBar2 MAC
+ Tool $430F
+ <<<
+_HideMenuBar MAC
+ Tool $450F
+ <<<
+_ShowMenuBar MAC
+ Tool $460F
+ <<<
+~SetMItemIcon MAC
+ PHWL ]1;]2
+ PHW ]3
+_SetMItemIcon MAC
+ Tool $470F
+ <<<
+~GetMItemIcon MAC
+ P2SW ]1
+_GetMItemIcon MAC
+ Tool $480F
+ <<<
+~SetMItemStruct MAC
+ PHWL ]1;]2
+ PHW ]3
+_SetMItemStruct MAC
+ Tool $490F
+ <<<
+~GetMItemStruct MAC
+ P2SW ]1
+_GetMItemStruct MAC
+ Tool $4A0F
+ <<<
+~RemoveMItemStruct MAC
+ PHW ]1
+_RemoveMItemStruct MAC
+ Tool $4B0F
+ <<<
+~GetMItemFlag2 MAC
+ P1SW ]1
+_GetMItemFlag2 MAC
+ Tool $4C0F
+ <<<
+~SetMItemFlag2 MAC
+ PxW ]1;]2
+_SetMItemFlag2 MAC
+ Tool $4D0F
+ <<<
+~GetMItemBlink MAC
+ PHA
+_GetMItemBlink MAC
+ Tool $4F0F
+ <<<
+~InsertPathMItems MAC
+ PHWL ]1;]2
+ PxW ]3;]4;]5;]6
+ PHL ]7
+_InsertPathMItems MAC
+ Tool $500F
+ <<<
+
+~qMenuStartUp MAC
+ PHW ]1
+ NextDP ]2;$100
+ Tool $20F
+ <<<
+~qNewMenu MAC
+ ~NewMenu ]1
+ PHW #0
+ _InsertMenu
+ <<<
diff --git a/Midi.Macs.S b/Midi.Macs.S
index 7747dfb..ef5d2a6 100644
--- a/Midi.Macs.S
+++ b/Midi.Macs.S
@@ -5,7 +5,6 @@
 ; and Roger Wagner Publishing, Inc. 1988
 ; All Rights Reserved
 ;
-
 _MidiBootInit MAC
  Tool $120
  <<<
diff --git a/MidiSyn.Macs.S b/MidiSyn.Macs.S
new file mode 100644
index 0000000..fcb7d19
--- /dev/null
+++ b/MidiSyn.Macs.S
@@ -0,0 +1,189 @@
+* MidiSynth tool macros
+*   by Dave Klimas
+;
+; Copyright Apple Computer, Inc. 1986, 1987
+; and Roger Wagner Publishing, Inc. 1988
+; All Rights Reserved
+;
+_MSBoot MAC
+ Tool $123
+ <<<
+_MSStartUp MAC
+ Tool $223
+ <<<
+_MSShutDown MAC
+ Tool $323
+ <<<
+~MSVersion MAC
+ PHA
+_MSVersion MAC
+ Tool $423
+ <<<
+_MSReset MAC
+ Tool $523
+ <<<
+~MSStatus MAC
+ PHA
+_MSStatus MAC
+ Tool $623
+ <<<
+~SetBasicChan MAC
+ PHW ]1
+_SetBasicChan MAC
+ Tool $923
+ <<<
+~SetMIDIMode MAC
+ PHW ]1
+_SetMIDIMode MAC
+ Tool $A23
+ <<<
+~PlayNote MAC
+ PxW ]1;]2;]3
+_PlayNote MAC
+ Tool $B23
+ <<<
+~StopNote MAC
+ PxW ]1;]2
+_StopNote MAC
+ Tool $C23
+ <<<
+_KillAllNotes MAC
+ Tool $D23
+ <<<
+~SetRecTrack MAC
+ PHW ]1
+_SetRecTrack MAC
+ Tool $E23
+ <<<
+~SetPlayTrack MAC
+ PxW ]1;]2
+_SetPlayTrack MAC
+ Tool $F23
+ <<<
+~TrackToChan MAC
+ PxW ]1;]2
+_TrackToChan MAC
+ Tool $1023
+ <<<
+~Locate MAC
+ PHS 2
+ PxL ]1;]2
+_Locate MAC
+ Tool $1123
+ <<<
+~SetVelComp MAC
+ PHW ]1
+_SetVelComp MAC
+ Tool $1223
+ <<<
+~SetMIDIPort MAC
+ PxW ]1;]2
+_SetMIDIPort MAC
+ Tool $1323
+ <<<
+~SetInstrument MAC
+ PHLW ]1;]2
+_SetInstrument MAC
+ Tool $1423
+ <<<
+~SeqPlayer MAC
+ PHL ]1
+_SeqPlayer MAC
+ Tool $1523
+ <<<
+~SetTempo MAC
+ PHW ]1
+_SetTempo MAC
+ Tool $1623
+ <<<
+~SetCallBack MAC
+ PHL ]1
+_SetCallBack MAC
+ Tool $1723
+ <<<
+~SysExOut MAC
+ PHLW ]1;]2
+ PHL ]3
+_SysExOut MAC
+ Tool $1823
+ <<<
+~SetBeat MAC
+ PHW ]1
+_SetBeat MAC
+ Tool $1923
+ <<<
+~MIDIMessage MAC
+ PxW ]1;]2;]3;]4
+ PHW ]5
+_MIDIMessage MAC
+ Tool $1A23
+ <<<
+~LocateEnd MAC
+ P2SL ]1
+_LocateEnd MAC
+ Tool $1B23
+ <<<
+~Merge MAC
+ PxL ]1;]2
+_Merge MAC
+ Tool $1C23
+ <<<
+~DeleteTrack MAC
+ PHWL ]1;]2
+_DeleteTrack MAC
+ Tool $1D23
+ <<<
+~SetMetro MAC
+ PxW ]1;]2
+ PHL ]3
+_SetMetro MAC
+ Tool $1E23
+ <<<
+~GetMSData MAC
+ PHS 4
+_GetMSData MAC
+ Tool $1F23
+ <<<
+~ConvertToTime MAC
+ PHS 2
+ PxW ]1;]2;]3;]4
+_ConvertToTime MAC
+ Tool $2023
+ <<<
+~ConvertToMeasure MAC
+ PHS 3
+ PxW ]1;]2
+ PHL ]3
+_ConvertToMeasure MAC
+ Tool $2123
+ <<<
+_MSSuspend MAC
+ Tool $2223
+ <<<
+_MSResume MAC
+ Tool $2323
+ <<<
+~SetTuningTable MAC
+ PHL ]1
+_SetTuningTable MAC
+ Tool $2423
+ <<<
+~GetTuningTable MAC
+ PHL ]1
+_GetTuningTable MAC
+ Tool $2523
+ <<<
+~SetTrackOut MAC
+ PxW ]1;]2
+_SetTrackOut MAC
+ Tool $2623
+ <<<
+~InitMIDIDriver MAC
+ PxW ]1;]2;]3
+ PHL ]4
+_InitMIDIDriver MAC
+ Tool $2723
+ <<<
+_RemoveMIDIDriver MAC
+ Tool $2823
+ <<<
diff --git a/Misc.Macs.S b/Misc.Macs.S
index dbc01fb..b2b3504 100644
--- a/Misc.Macs.S
+++ b/Misc.Macs.S
@@ -207,3 +207,84 @@ _GetAbsClamp MAC
 _SysBeep MAC
  Tool $2C03
  <<<
+~AddToQueue MAC
+ PxL ]1;]2
+_AddToQueue MAC
+ Tool $2E03
+ <<<
+~DeleteFromQueue MAC
+ PxL ]1;]2
+_DeleteFromQueue MAC
+ Tool $2F03
+ <<<
+~SetInterruptState MAC
+ PHLW ]1;]2
+_SetInterruptState MAC
+ Tool $3003
+ <<<
+~GetInterruptState MAC
+ PHLW ]1;]2
+_GetInterruptState MAC
+ Tool $3103
+ <<<
+~GetIntStateRecSize MAC
+ PHA
+_GetIntStateRecSize MAC
+ Tool $3203
+ <<<
+~ReadMouse2 MAC
+ PHS 3
+_ReadMouse2 MAC
+ Tool $3303
+ <<<
+~GetCodeResConverter MAC
+ PHS 2
+_GetCodeResConverter MAC
+ Tool $3403
+ <<<
+_GetROMResource MAC ;private
+ Tool $3503
+ <<<
+_ReleaseROMResource MAC ;private
+ Tool $3603
+ <<<
+~ConvSeconds MAC
+ P2SW ]1
+ PxL ]2;]3
+_ConvSeconds MAC
+ Tool $3703
+ <<<
+~SysBeep MAC
+ PHW ]1
+_SysBeep MAC
+ Tool $3803
+ <<<
+~VersionString MAC
+ PHW ]1
+ PxL ]2;]3
+_VersionString MAC
+ Tool $3903
+ <<<
+~WaitUntil MAC
+ P1SW ]1
+ PHW ]2
+_WaitUntil MAC
+ Tool $3A03
+ <<<
+~StringToText MAC
+ PHS 2
+ PHWL ]1;]2
+ PHWL ]3;]4
+_StringToText MAC
+ Tool $3B03
+ <<<
+~ShowBootInfo MAC
+ PxL ]1;]2
+_ShowBootInfo MAC
+ Tool $3C03
+ <<<
+~ScanDevices MAC
+ PHA
+_ScanDevices MAC
+ Tool $3D03
+ <<<
diff --git a/NoteSeq.Macs.S b/NoteSeq.Macs.S
index 250521a..6bacf66 100644
--- a/NoteSeq.Macs.S
+++ b/NoteSeq.Macs.S
@@ -81,3 +81,8 @@ _StartInts MAC
 _StopInts MAC
  Tool $141A
  <<<
+~StartSeqRel MAC
+ PxL ]1;]2;]3
+_StartSeqRel MAC
+ Tool $151A
+ <<<
diff --git a/NoteSyn.Macs.S b/NoteSyn.Macs.S
index 7887712..f739b5c 100644
--- a/NoteSyn.Macs.S
+++ b/NoteSyn.Macs.S
@@ -6,50 +6,60 @@
 ; All Rights Reserved
 ;
 _NSBootInit MAC
- Tool $0119
+ Tool $119
  <<<
 ~NSStartUp MAC
  PHWL ]1;]2
 _NSStartUp MAC
- Tool $0219
+ Tool $219
  <<<
 _NSShutDown MAC
- Tool $0319
+ Tool $319
  <<<
 ~NSVersion MAC
  PHA
 _NSVersion MAC
- Tool $0419
+ Tool $419
  <<<
 _NSReset MAC
- Tool $0519
+ Tool $519
  <<<
 ~NSStatus MAC
  PHA
 _NSStatus MAC
- Tool $0619
+ Tool $619
  <<<
 ~AllocGen MAC
  P1SW ]1
 _AllocGen MAC
- Tool $0919
+ Tool $919
  <<<
 ~DeallocGen MAC
  PHW ]1
 _DeallocGen MAC
- Tool $0A19
+ Tool $A19
  <<<
 ~NoteOn MAC
  PxW ]1;]2;]3
  PHL ]4
 _NoteOn MAC
- Tool $0B19
+ Tool $B19
  <<<
 ~NoteOff MAC
  PxW ]1;]2
 _NoteOff MAC
- Tool $0C19
+ Tool $C19
  <<<
 _AllNotesOff MAC
- Tool $0D19
+ Tool $D19
+ <<<
+~NSSetUpdateRate MAC
+ P1SW ]1
+_NSSetUpdateRate MAC
+ Tool $E19
+ <<<
+~NSSetUserUpdateRtn MAC
+ P2SL ]1
+_NSSetUserUpdateRtn MAC
+ Tool $F19
  <<<
diff --git a/Print.Macs.S b/Print.Macs.S
index 2f214bb..f2de6c7 100644
--- a/Print.Macs.S
+++ b/Print.Macs.S
@@ -94,13 +94,16 @@ _PrError MAC
 _PrSetError MAC
  Tool $1513
  <<<
-~PrChooser MAC ; alias
 ~PrChoosePrinter MAC
  PHA
-_PrChooser MAC ; alias
 _PrChoosePrinter MAC
  Tool $1613
  <<<
+~PrGetPrinterSpecs MAC
+ PHS 2
+_PrGetPrinterSpecs MAC
+ Tool $1813
+ <<<
 _LLDStartUp MAC
  Tool $1913
  <<<
@@ -126,6 +129,31 @@ _PrDriverVer MAC
 _PrPortVer MAC
  Tool $2413
  <<<
+~PrGetZoneName MAC
+ PHS 2
+_PrGetZoneName MAC
+ Tool $2513
+ <<<
+~PrGetPrinterDvrName MAC
+ PHS 2
+_PrGetPrinterDvrName MAC
+ Tool $2813
+ <<<
+~PrGetPortDvrName MAC
+ PHS 2
+_PrGetPortDvrName MAC
+ Tool $2913
+ <<<
+~PrGetUserName MAC
+ PHS 2
+_PrGetUserName MAC
+ Tool $2A13
+ <<<
+~PrGetNetworkName MAC
+ PHS 2
+~PrGetNetworkName MAC
+ Tool $2B13
+ <<<
 ~PMUnloadDriver MAC
  PHW ]1
 _PMUnloadDriver MAC
@@ -136,3 +164,27 @@ _PMUnloadDriver MAC
 _PMLoadDriver MAC
  Tool $3513
  <<<
+~PrGetDocName MAC
+ PHS 2
+_PrGetDocName MAC
+ Tool $3613
+ <<<
+~PrSetDocName MAC
+ PHL ]1
+_PrSetDocName MAC
+ Tool $3713
+ <<<
+~PrGetPgOrientation MAC
+ P1SL ]1
+_PrGetPgOrientation MAC
+ Tool $3813
+ <<<
+
+~qPMStartUp MAC
+ PHW ]1
+ CLC
+ LDA ]2
+ ADC ]NextDP
+ PHA
+ Tool $0213
+ <<<
diff --git a/QD.Macs.S b/QD.Macs.S
index 056ddcb..c6af1f8 100644
--- a/QD.Macs.S
+++ b/QD.Macs.S
@@ -266,8 +266,6 @@ _SolidPattern MAC
  Tool $3904
  <<<
 ~MoveTo MAC
-GotoXY MAC
-QDGotoXY MAC
  PxW ]1;]2
 _MoveTo MAC
  Tool $3A04
@@ -1085,3 +1083,19 @@ _GetRomFont MAC
 _GetFontLore MAC
  Tool $D904
  <<<
+~Get640Colors MAC
+ PHA
+_Get640Colors MAC
+ Tool $DA04
+ <<<
+~Set640Color MAC
+ PHW ]1
+_Set640Color MAC
+ Tool $DB04
+ <<<
+
+~qQDStartUp MAC
+ NextDP ]1;$300
+ PxW ]2;]3;]4
+ Tool $204
+ <<<
diff --git a/QDAux.Macs.S b/QDAux.Macs.S
index c5d2e98..69f241a 100644
--- a/QDAux.Macs.S
+++ b/QDAux.Macs.S
@@ -48,3 +48,37 @@ _DrawIcon MAC
 _SpecialRect MAC
  Tool $C12
  <<<
+~SeedFill MAC
+ PxL ]1;]2;]3;]4
+ PxW ]5;]6;]7
+ PxL ]8;]9
+_SeedFill MAC
+ Tool $D12
+ <<<
+~CalcMask MAC
+ PxL ]1;]2;]3;]4
+ PHW ]5
+ PxL ]6;]7
+_CalcMask MAC
+ Tool $E12
+ <<<
+~GetSysIcon MAC
+ P2SW ]1
+ PHWL ]2;]3
+_GetSysIcon MAC
+ Tool $F12
+ <<<
+~PixelMap2Rgn MAC
+ P2SL ]1
+ PxW ]2;]3
+_PixelMap2Rgn MAC
+ Tool $1012
+ <<<
+_IBeamCursor MAC
+ Tool $1312
+ <<<
+~WooshRect MAC
+ PxL ]1;]2;]3
+_WooshRect MAC
+ Tool $1412
+ <<<
diff --git a/Resource.Macs.S b/Resource.Macs.S
new file mode 100644
index 0000000..bd69900
--- /dev/null
+++ b/Resource.Macs.S
@@ -0,0 +1,238 @@
+* Resource macros
+*   by Dave Klimas
+;
+; Copyright Apple Computer, Inc. 1986, 1987
+; and Roger Wagner Publishing, Inc. 1988
+; All Rights Reserved
+;
+_ResourceBootInit MAC
+ Tool $11E
+ <<<
+~ResourceStartUp MAC
+ PHW ]1
+_ResourceStartUp MAC
+ Tool $21E
+ <<<
+_ResourceShutDown MAC
+ Tool $31E
+ <<<
+~ResourceVersion MAC
+ PHA
+_ResourceVersion MAC
+ Tool $41E
+ <<<
+_ResourceReset MAC
+ Tool $51E
+ <<<
+~ResourceStatus MAC
+ PHA
+_ResourceStatus MAC
+ Tool $61E
+ <<<
+~CreateResourceFile MAC
+ PHLW ]1;]2
+ PHWL ]3;]4
+_CreateResourceFile MAC
+ Tool $91E
+ <<<
+~OpenResourceFile MAC
+ P1SW ]1
+ PxL ]2;]3
+_OpenResourceFile MAC
+ Tool $A1E
+ <<<
+~CloseResourceFile MAC
+ PHW ]1
+_CloseResourceFile MAC
+ Tool $B1E
+ <<<
+~AddResource MAC
+ PHLW ]1;]2
+ PHWL ]3;]4
+_AddResource MAC
+ Tool $C1E
+ <<<
+~UpdateResourceFile MAC
+ PHW ]1
+_UpdateResourceFile MAC
+ Tool $D1E
+ <<<
+~LoadResource MAC
+ P2SW ]1
+ PHL ]2
+_LoadResource MAC
+ Tool $E1E
+ <<<
+~RemoveResource MAC
+ PHWL ]1;]2
+_RemoveResource MAC
+ Tool $F1E
+ <<<
+~MarkResourceChange MAC
+ PxW ]1;]2
+ PHL ]3
+_MarkResourceChange MAC
+ Tool $101E
+ <<<
+~SetCurResourceFile MAC
+ PHW ]1
+_SetCurResourceFile MAC
+ Tool $111E
+ <<<
+~GetCurResourceFile MAC
+ PHA
+_GetCurResourceFile MAC
+ Tool $121E
+ <<<
+~SetCurResourceApp MAC
+ PHW ]1
+_SetCurResourceApp MAC
+ Tool $131E
+ <<<
+~GetCurResourceApp MAC
+ PHA
+_GetCurResourceApp MAC
+ Tool $141E
+ <<<
+~HomeResourceFile MAC
+ P1SW ]1
+ PHL ]2
+_HomeResourceFile MAC
+ Tool $151E
+ <<<
+~WriteResource MAC
+ PHWL ]1;]2
+_WriteResource MAC
+ Tool $161E
+ <<<
+~ReleaseResource MAC
+ PxW ]1;]2
+ PHL ]3
+_ReleaseResource MAC
+ Tool $171E
+ <<<
+~DetatchResource MAC
+ PHWL ]1;]2
+_DetatchResource MAC
+ Tool $181E
+ <<<
+~UniqueResourceID MAC
+ P2SW ]1
+ PHW ]2
+_UniqueResourceID MAC
+ Tool $191E
+ <<<
+~SetResourceID MAC
+ PHLW ]1;]2
+ PHL ]3
+_SetResourceID MAC
+ Tool $1A1E
+ <<<
+~GetResourceAttr MAC
+ P1SW ]1
+ PHL ]2
+_GetResourceAttr MAC
+ Tool $1B1E
+ <<<
+~SetResourceAttr MAC
+ PxW ]1;]2
+ PHL ]3
+_SetResourceAttr MAC
+ Tool $1C1E
+ <<<
+~GetResourceSize MAC
+ P2SW ]1
+ PHL ]2
+_GetResourceSize MAC
+ Tool $1D1E
+ <<<
+~MatchResourceHandle MAC
+ PxL ]1;]2
+_MatchResourceHandle MAC
+ Tool $1E1E
+ <<<
+~GetOpenFileRefNum MAC
+ P1SW ]1
+_GetOpenFileRefNum MAC
+ Tool $1F1E
+ <<<
+~CountTypes MAC
+ PHA
+_CountTypes MAC
+ Tool $201E
+ <<<
+~GetIndType MAC
+ P1SW ]1
+_GetIndType MAC
+ Tool $211E
+ <<<
+~CountResources MAC
+ P2SW ]1
+_CountResources MAC
+ Tool $221E
+ <<<
+~GetIndResource MAC
+ P2SW ]1
+ PHL ]2
+_GetIndResource MAC
+ Tool $231E
+ <<<
+~SetResourceLoad MAC
+ P1SW ]1
+_SetResourceLoad MAC
+ Tool $241E
+ <<<
+~SetResourceFileDepth MAC
+ P1SW ]1
+_SetResourceFileDepth MAC
+ Tool $251E
+ <<<
+~GetMapHandle MAC
+ P2SW ]1
+_GetMapHandle MAC
+ Tool $261E
+ <<<
+~LoadAbsResource MAC
+ P2SL ]1
+ PHL ]2
+ PHWL ]3;]4
+_LoadAbsResource MAC
+ Tool $271E
+ <<<
+~ResourceConverter MAC
+ PHL ]1
+ PxW ]2;]3
+_ResourceConverter MAC
+ Tool $281E
+ <<<
+~LoadResource2 MAC
+ PHS 2
+ PHWL ]1;]2
+ PHWL ]3;]4
+_LoadResource2 MAC
+ Tool $291E
+ <<<
+~FindNamedResource MAC
+ P2SW ]1
+ PxL ]2;]3
+_FindNamedResource MAC
+ Tool $2A1E
+ <<<
+~GetResourceName MAC
+ PHWL ]1;]2
+ PHL ]3
+_GetResourceName MAC
+ Tool $2B1E
+ <<<
+~LoadNamedResource MAC
+ P2SW ]1
+ PHL ]2
+_LoadNamedResource MAC
+ Tool $2C1E
+ <<<
+~SetResourceName MAC
+ PHWL ]1;]2
+ PHL ]3
+_SetResourceName MAC
+ Tool $2D1E
+ <<<
diff --git a/Sane.Macs.S b/Sane.Macs.S
index c313236..5ec886c 100644
--- a/Sane.Macs.S
+++ b/Sane.Macs.S
@@ -38,17 +38,21 @@ _SANEDecStr816 MAC
 _SANEElems816 MAC
  Tool $B0A
  <<<
+~qSANEStartUp MAC
+ NextDP ]1;$100
+ Tool $20A
+ <<<
 * Auxiliary macros
 
-FOPRF MAC  ;call FP
+FOPRF MAC ;call FP
  PEA ]1
  _SANEFP816
  <<<
-FOPRD MAC  ;call DecStr
+FOPRD MAC ;call DecStr
  PEA ]1
  _SANEDecStr816
  <<<
-FOPRE MAC  ;call Elems
+FOPRE MAC ;call Elems
  PEA ]1
  _SANEElems816
  <<<
@@ -360,61 +364,61 @@ FCPXL MAC
 FBEQ MAC
  BEQ ]1
  <<<
-FBLT MAC  ;less
+FBLT MAC ;less
  BMI ]1
  <<<
-FBLE MAC  ;less or equal
+FBLE MAC ;less or equal
  BMI ]1
- BEQ ]1
+ BEQ ]2
  <<<
-FBGT MAC  ;greater
+FBGT MAC ;greater
  BVS ]1
  <<<
-FBGE MAC  ;greater or equal
+FBGE MAC ;greater or equal
  BVS ]1
  BEQ ]1
  <<<
-FBULT MAC  ;less or unordered
+FBULT MAC ;less or unordered
  BMI ]1
  BVS *+4
  BNE ]1
  <<<
-FBULE MAC  ;unordered, less, or equal
+FBULE MAC ;unordered, less, or equal
  BMI ]1
  BEQ ]1
  BVC ]1
  <<<
-FBUGT MAC  ;unordered or greater
+FBUGT MAC ;unordered or greater
  BVS ]1
  BMI *+4
  BNE ]1
  <<<
-FBUGE MAC  ;unordered, greater, or equal
+FBUGE MAC ;unordered, greater, or equal
  BVS ]1
  BEQ ]1
  BPL ]1
  <<<
-FBU MAC  ;unordered
+FBU MAC ;unordered
  BVS *+6
  BMI *+4
  BNE ]1
  <<<
-FBO MAC  ;ordered
+FBO MAC ;ordered
  BMI ]1
  BVS ]1
  BEQ ]1
  <<<
-FBNE MAC  ;not equal
+FBNE MAC ;not equal
  BMI ]1
  BVS ]1
  BNE ]1
  <<<
-FBUE MAC  ;unordered, equal
+FBUE MAC ;unordered, equal
  BEQ ]1
  BMI *+4
  BVC ]1
  <<<
-FBLG MAC  ;less or greater
+FBLG MAC ;less or greater
  BMI ]1
  BVS ]1
  <<<
@@ -441,58 +445,58 @@ FCLASSL MAC
 * The following macros provide branches based on the
 * the result of a FCLASSz macro.
 
-FBSNAN MAC  ;signaling NaN
+FBSNAN MAC ;signaling NaN
  TXA
  ASL
  CMP #2*$FC
  BEQ ]1
  <<<
-FBQNAN MAC  ;quiet NaN
+FBQNAN MAC ;quiet NaN
  TXA
  ASL
  CMP #2*$FD
  BEQ ]1
  <<<
-FBINF MAC  ;infinite
+FBINF MAC ;infinite
  TXA
  ASL
  CMP #2*$FE
  BEQ ]1
  <<<
-FBZERO MAC  ;zero
+FBZERO MAC ;zero
  TXA
  ASL
  CMP #2*$FF
  BEQ ]1
  <<<
-FBNORM MAC  ;normal
+FBNORM MAC ;normal
  TXA
  ASL
  BEQ ]1
  <<<
-FBDENORM MAC  ;denormal
+FBDENORM MAC ;denormal
  TXA
  ASL
  CMP #2*1
  BEQ ]1
  <<<
-FBNZENUM MAC  ;non-zero num (norm or denorm)
+FBNZENUM MAC ;non-zero num (norm or denorm)
  TXA
  XBA
  ASL
  BCC ]1
  <<<
-FBNUM MAC  ;number (zero, norm or denorm)
+FBNUM MAC ;number (zero, norm or denorm)
  TXA
  INC A
  XBA
  ASL
  BCC ]1
  <<<
-FBMINUS MAC  ;minus sign
+FBMINUS MAC ;minus sign
  BMI ]1
  <<<
-FBPLUS MAC  ;plus sign
+FBPLUS MAC ;plus sign
  BPL ]1
  <<<
 
@@ -534,66 +538,66 @@ FSETHV MAC
 
 * Elementary function macros
 
-FLNX MAC  ;natural (base-e) log
+FLNX MAC ;natural (base-e) log
  FOPRE $00
  <<<
-FLOG2X MAC  ;base-2 log
+FLOG2X MAC ;base-2 log
  FOPRE $02
  <<<
-FLN1X MAC  ;ln (1 + x)
+FLN1X MAC ;ln (1 + x)
  FOPRE $04
  <<<
-FLOG21X MAC  ;log2 (1 +x)
+FLOG21X MAC ;log2 (1 +x)
  FOPRE $06
  <<<
-FEXPX MAC  ;base-e exponential
+FEXPX MAC ;base-e exponential
  FOPRE $08
  <<<
-FEXP2X MAC  ;base-2 exponential
+FEXP2X MAC ;base-2 exponential
  FOPRE $0A
  <<<
-FEXP1X MAC  ;exp (x) - 1
+FEXP1X MAC ;exp (x) - 1
  FOPRE $0C
  <<<
-FEXP21X MAC  ;exp2 (x) - 1
+FEXP21X MAC ;exp2 (x) - 1
  FOPRE $0E
  <<<
-FXPWRI MAC  ;integer exponential
+FXPWRI MAC ;integer exponential
  FOPRE $10
  <<<
-FXPWRY MAC  ;general exponential
+FXPWRY MAC ;general exponential
  FOPRE $12
  <<<
-FCOMPOUND MAC  ;compound
+FCOMPOUND MAC ;compound
  FOPRE $14
  <<<
-FANNUITY MAC  ;annuity
+FANNUITY MAC ;annuity
  FOPRE $16
  <<<
-FATANX MAC  ;arctangent
+FATANX MAC ;arctangent
  FOPRE $18
  <<<
-FSINX MAC  ;sine
+FSINX MAC ;sine
  FOPRE $1A
  <<<
-FCOSX MAC  ;cosine
+FCOSX MAC ;cosine
  FOPRE $1C
  <<<
-FTANX MAC  ;tangent
+FTANX MAC ;tangent
  FOPRE $1E
  <<<
-FRANDX MAC  ;random number generator
+FRANDX MAC ;random number generator
  FOPRE $20
  <<<
 
 * Scanner and formatter function macros
 
-FPSTR2DEC MAC  ;pascal string to decimal record
+FPSTR2DEC MAC ;pascal string to decimal record
  FOPRD 0
  <<<
-FDEC2STR MAC  ;decimal record to pascal string
+FDEC2STR MAC ;decimal record to pascal string
  FOPRD 1
  <<<
-FCSTR2DEC MAC  ;C string to decimal record
+FCSTR2DEC MAC ;C string to decimal record
  FOPRD 2
  <<<
diff --git a/Scrap.Macs.S b/Scrap.Macs.S
index 32ad122..4444daa 100644
--- a/Scrap.Macs.S
+++ b/Scrap.Macs.S
@@ -77,3 +77,8 @@ _GetScrapCount MAC
 _GetScrapState MAC
  Tool $1316
  <<<
+~GetIndScrap MAC
+ PHWL ]1;]2
+_GetIndScrap MAC
+ Tool $1416
+ <<<
diff --git a/Sound.Macs.S b/Sound.Macs.S
index 1a400b7..8931c29 100644
--- a/Sound.Macs.S
+++ b/Sound.Macs.S
@@ -91,3 +91,27 @@ _SetUserSoundIRQV MAC
 _FFSoundDoneStatus MAC
  Tool $1408
  <<<
+~FFSetUpSound MAC
+ PHWL ]1;]2
+_FFSetUpSound MAC
+ Tool $1508
+ <<<
+~FFStartPlaying MAC
+ PHW ]1
+_FFStartPlaying MAC
+ Tool $1608
+ <<<
+~SetDocReg MAC
+ PHL ]1
+_SetDocReg MAC
+ Tool $1708
+ <<<
+~ReadDocReg MAC
+ PHL ]1
+_ReadDocReg MAC
+ Tool $1808
+ <<<
+~qSoundStartUp MAC
+ NextDP ]1;$100
+ Tool $208
+ <<<
diff --git a/Std.Macs.S b/Std.Macs.S
index bf4caf6..4fb1795 100644
--- a/Std.Macs.S
+++ b/Std.Macs.S
@@ -62,3 +62,46 @@ _SFPPutFile MAC
 _SFAllCaps MAC
  Tool $D17
  <<<
+~SFGetFile2 MAC
+ PxW ]1;]2;]3
+ PxL ]4;]5;]6;]7
+_SFGetFile2 MAC
+ Tool $E17
+ <<<
+~SFPutFile2 MAC
+ PxW ]1;]2;]3
+ PHLW ]4;]5
+ PxL ]6;]7
+_SFPutFile2 MAC
+ Tool $F17
+ <<<
+_SFPGetFile2 MAC
+ Tool $1017
+ <<<
+_SFPPutFile2 MAC
+ Tool $1117
+ <<<
+~SFShowInvisible MAC
+ P1SW ]1
+_SFShowInvisible MAC
+ Tool $1217
+ <<<
+~SFReScan MAC
+ PxL ]1;]2
+_SFReScan MAC
+ Tool $1317
+ <<<
+~SFMultiGet2 MAC
+ PxW ]1;]2;]3
+ PxL ]4;]5;]6;]7
+_SFMultiGet2 MAC
+ Tool $1417
+ <<<
+_SFPMultiGet2 MAC
+ Tool $1517
+ <<<
+~qSFStartUp MAC
+ PHW ]1
+ NextDP ]2;$100
+ Tool $217
+ <<<
diff --git a/Text.Macs.S b/Text.Macs.S
index a6f940e..976b2b8 100644
--- a/Text.Macs.S
+++ b/Text.Macs.S
@@ -171,13 +171,3 @@ _TextReadBlock MAC
 _ReadLine MAC
  Tool $240C
  <<<
-
-PrintLn MAC ; print a line of text
- pea ^text 
- pea text 
- ldx #$1A0C 
- jsl $E10000 
- bra cont 
-text str ]1
-cont
- <<<
diff --git a/TextEdit.Macs.S b/TextEdit.Macs.S
new file mode 100644
index 0000000..aea0ec0
--- /dev/null
+++ b/TextEdit.Macs.S
@@ -0,0 +1,185 @@
+* TextEdit macros
+*   by Dave Klimas
+
+_TEBootInit MAC
+ Tool $122
+ <<<
+~TEStartUp MAC
+ PxW ]1;]2
+_TEStartUp MAC
+ Tool $222
+ <<<
+_TEShutDown MAC
+ Tool $322
+ <<<
+~TEVersion MAC
+ PHA
+_TEVersion MAC
+ Tool $422
+ <<<
+_TEReset MAC
+ Tool $522
+ <<<
+~TEStatus MAC
+ PHA
+_TEStatus MAC
+ Tool $622
+ <<<
+~TENew MAC
+ P2SL ]1
+_TENew MAC
+ Tool $922
+ <<<
+~TEKill MAC
+ PHL ]1
+_TEKill MAC
+ Tool $A22
+ <<<
+~TESetText MAC
+ PHWL ]1;]2
+ PHLW ]3;]4
+ PxL ]5;]6
+_TESetText MAC
+ Tool $B22
+ <<<
+~TEGetText MAC
+ PHS 2
+ PHWL ]1;]2
+ PHLW ]3;]4
+ PxL ]5;]6
+_TEGetText MAC
+ Tool $C22
+ <<<
+~TEGetTextInfo MAC
+ PHLW ]1;]2
+ PHL ]3
+_TEGetTextInfo MAC
+ Tool $D22
+ <<<
+~TEIdle MAC
+ PHL ]1
+_TEIdle MAC
+ Tool $E22
+ <<<
+~TEActivate MAC
+ PHL ]1
+_TEActivate MAC
+ Tool $F22
+ <<<
+~TEDeactivate MAC
+ PHL ]1
+_TEDeactivate MAC
+ Tool $1022
+ <<<
+~TEClick MAC
+ PxL ]1;]2
+_TEClick MAC
+ Tool $1122
+ <<<
+~TEUpdate MAC
+ PHL ]1
+_TEUpdate MAC
+ Tool $1222
+ <<<
+~TEPaintText MAC
+ P2SL ]1
+ PxL ]2;]3
+ PHWL ]4;]5
+_TEPaintText MAC
+ Tool $1322
+ <<<
+~TEKey MAC
+ PxL ]1;]2
+_TEKey MAC
+ Tool $1422
+ <<<
+~TECut MAC
+ PHL ]1
+_TECut MAC
+ Tool $1622
+ <<<
+~TECopy MAC
+ PHL ]1
+_TECopy MAC
+ Tool $1722
+ <<<
+~TEPaste MAC
+ PHL ]1
+_TEPaste MAC
+ Tool $1822
+ <<<
+~TEClear MAC
+ PHL ]1
+_TEClear MAC
+ Tool $1922
+ <<<
+~TEInsert MAC
+ PHWL ]1;]2
+ PHLW ]3;]4
+ PxL ]5;]6
+_TEInsert MAC
+ Tool $1A22
+ <<<
+~TEReplace MAC
+ PHWL ]1;]2
+ PHLW ]3;]4
+ PxL ]5;]6
+_TEReplace MAC
+ Tool $1B22
+ <<<
+~TEGetSelection MAC
+ PxL ]1;]2;]3
+_TEGetSelection MAC
+ Tool $1C22
+ <<<
+~TESetSelection MAC
+ PxL ]1;]2;]3
+_TESetSelection MAC
+ Tool $1D22
+ <<<
+~TEGetSelectionStyle MAC
+ PHA
+ PxL ]1;]2;]3
+_TEGetSelectionStyle MAC
+ Tool $1E22
+ <<<
+~TEStyleChange MAC
+ PHW ]1
+ PxL ]2;]3
+_TEStyleChange MAC
+ Tool $1F22
+ <<<
+~TEOffsetToPoint MAC
+ PxL ]1;]2;]3;]4
+_TEOffsetToPoint MAC
+ Tool $2022
+ <<<
+~TEPointToOffset MAC
+ PHS 2
+ PxL ]1;]2;]3
+_TEPointToOffset MAC
+ Tool $2122
+ <<<
+~TEGetDefProc MAC
+ PHS 2
+_TEGetDefProc MAC
+ Tool $2222
+ <<<
+~TEGetRuler MAC
+ PHWL ]1;]2
+ PHL ]3
+_TEGetRuler MAC
+ Tool $2322
+ <<<
+~TESetRuler MAC
+ PHW ]1
+ PxL ]2;]3
+_TESetRuler MAC
+ Tool $2422
+ <<<
+~TEScroll MAC
+ PHW ]1
+ PxL ]2;]3;]4
+_TEScroll MAC
+ Tool $2522
+ <<<
diff --git a/Video.Macs.S b/Video.Macs.S
new file mode 100644
index 0000000..c25e034
--- /dev/null
+++ b/Video.Macs.S
@@ -0,0 +1,139 @@
+* Video overlay card macros
+*   by Dave Klimas
+;
+; Copyright Apple Computer, Inc. 1986, 1987
+; and Roger Wagner Publishing, Inc. 1988
+; All Rights Reserved
+;
+_VDBootInit MAC
+ Tool $0121
+ <<<
+_VDStartUp MAC
+ Tool $0221
+ <<<
+_VDShutdown MAC
+ Tool $0321
+ <<<
+~VDVersion MAC
+ PHA
+_VDVersion MAC
+ Tool $0421
+ <<<
+_VDReset MAC
+ Tool $0521
+ <<<
+~VDStatus MAC
+ PHA
+_VDStatus MAC
+ Tool $0621
+ <<<
+~VDGetFeatures MAC
+ P1SW ]1
+_VDGetFeatures MAC
+ Tool $1B21
+ <<<
+~VDInControl MAC
+ PxW ]1;]2
+_VDInControl MAC
+ Tool $1C21
+ <<<
+~VDInStatus MAC
+ P1SW ]1
+_VDInStatus MAC
+ Tool $0921
+ <<<
+~VDInSetStd MAC
+ PHW ]1
+_VDInSetStd MAC
+ Tool $0A21
+ <<<
+~VDInGetStd MAC
+ PHA
+_VDInGetStd MAC
+ Tool $0B21
+ <<<
+~VDInConvAdj MAC
+ PxW ]1;]2
+_VDInConvAdj MAC
+ Tool $0C21
+ <<<
+~VDKeyControl MAC
+ PxW ]1;]2
+_VDKeyControl MAC
+ Tool $0D21
+ <<<
+~VDKeyStatus MAC
+ P1SW ]1
+_VDKeyStatus MAC
+ Tool $0E21
+ <<<
+~VDKeySetKCol MAC
+ PxW ]1;]2;]3
+_VDKeySetKCol MAC
+ Tool $0F21
+ <<<
+~VDKeyGetKRCol MAC
+ PHA
+_VDKeyGetKRCol MAC
+ Tool $1021
+ <<<
+~VDKeyGetKGCol MAC
+ PHA
+_VDKeyGetKGCol MAC
+ Tool $1121
+ <<<
+~VDKeyGetKBCol MAC
+ PHA
+_VDKeyGetKBCol MAC
+ Tool $1221
+ <<<
+~VDKeySetKDiss MAC
+ PHW ]1
+_VDKeySetKDiss MAC
+ Tool $1321
+ <<<
+~VDKeyGetKDiss MAC
+ PHA
+_VDKeyGetKDiss MAC
+ Tool $1421
+ <<<
+~VDKeySetNKDiss MAC
+ PHW ]1
+_VDKeySetNKDiss MAC
+ Tool $1521
+ <<<
+~VDKeyGetNKDiss MAC
+ PHA
+_VDKeyGetNKDiss MAC
+ Tool $1621
+ <<<
+~VDOutSetStd MAC
+ PHW ]1
+_VDOutSetStd MAC
+ Tool $1721
+ <<<
+~VDOutGetStd MAC
+ PHA
+_VDOutGetStd MAC
+ Tool $1821
+ <<<
+~VDOutControl MAC
+ PxW ]1;]2
+_VDOutControl MAC
+ Tool $1921
+ <<<
+~VDOutStatus MAC
+ P1SW ]1
+_VDOutStatus MAC
+ Tool $1A21
+ <<<
+~VDGGControl MAC
+ PxW ]1;]2
+_VDGGControl MAC
+ Tool $1D21
+ <<<
+~VDGGStatus MAC
+ P1SW ]1
+_VDGGStatus MAC
+ Tool $1E21
+ <<<
diff --git a/Window.Macs.S b/Window.Macs.S
index 21f7ce5..b63a53a 100644
--- a/Window.Macs.S
+++ b/Window.Macs.S
@@ -288,7 +288,6 @@ _SetZoomRect MAC
 ~RefreshDesktop MAC
  PHL ]1
 _RefreshDesktop MAC
-_Refresh MAC
  Tool $390E
  <<<
 ~InvalRect MAC
@@ -450,8 +449,7 @@ _GetWindowMgrGlobals MAC
  Tool $580E
  <<<
 ~AlertWindow MAC
- PHA
- PHW ]1
+ P1SW ]1
  PxL ]2;]3
 _AlertWindow MAC
  Tool $590E
@@ -465,8 +463,88 @@ _EndFrameDrawing MAC
  Tool $5B0E
  <<<
 ~ResizeWindow MAC
- PHW ]1
- PxL ]2;]3
+ PHWL ]1;]2
+ PHL ]3
 _ResizeWindow MAC
  Tool $5C0E
  <<<
+_TaskMasterContent MAC ;private
+ Tool $5D0E
+ <<<
+_TaskMasterKey MAC ;private
+ Tool $5E0E
+ <<<
+~TaskMasterDA MAC
+ P1SW ]1
+ PHL ]2
+_TaskMasterDA MAC
+ Tool $5F0E
+ <<<
+~CompileText MAC
+ P2SW ]1
+ PxL ]2;]3
+ PHW ]4
+_CompileText MAC
+ Tool $600E
+ <<<
+~NewWindow2 MAC
+ PHS 2
+ PxL ]1;]2;]3;]4
+ PHWL ]5;]6
+ PHW ]7
+_NewWindow2 MAC
+ Tool $610E
+ <<<
+~ErrorWindow MAC
+ P1SW ]1
+ PHLW ]2;]3
+_ErrorWindow MAC
+ Tool $620E
+ <<<
+~GetAuxWIndInfo MAC
+ P2SL ]1
+_GetAuxWIndInfo MAC
+ Tool $630E
+ <<<
+~DoModalWindow MAC
+ P2SL ]1
+ PxL ]2;]3
+ PHLW ]4;]5
+_DoModalWindow MAC
+ Tool $640E
+ <<<
+~MWGetCtlPart MAC
+ PHA
+_MWGetCtlPart MAC
+ Tool $650E
+ <<<
+~MWSetMenuProc MAC
+ P2SL ]1
+_MWSetMenuProc MAC
+ Tool $660E
+ <<<
+_MWStdDrawProc MAC
+ Tool $670E
+ <<<
+_MWSetUpEditMenu MAC
+ Tool $680E
+ <<<
+~FindCursorCtl MAC
+ PHA
+ PHLW ]1;]2
+ PHWL ]3;]4
+_FindCursorCtl MAC
+ Tool $690E
+ <<<
+~ResizeInfoBar MAC
+ PxW ]1;]2
+ PHL ]3
+_ResizeInfoBar MAC
+ Tool $6A0E
+ <<<
+~HandleDiskInsert MAC
+ PHS 2
+ PxW ]1;]2
+_HandleDiskInsert MAC
+ Tool $6B0E
+ <<<