Adding keywords to MS-DOS
Miscellaneous bugfixes