--- np2/x11/main.c	2003/11/16 16:43:45	1.1
+++ np2/x11/main.c	2003/11/23 12:46:55	1.5
@@ -104,7 +104,7 @@ static void
 usage(void)
 {
 
-	printf("Usage: %s [options] [[FD0 image] [[FD1 image] [[FD2 image] [FD3 image]]]]\n", progname);
+	printf("Usage: %s [options] [[FD1 image] [[FD2 image] [[FD3 image] [FD4 image]]]]\n", progname);
 	exit(1);
 }
 
@@ -203,6 +203,13 @@ main(int argc, char *argv[])
 			}
 		}
 	}
+	if (timidity_cfgfile_path[0] == '\0') {
+		file_cpyname(timidity_cfgfile_path, modulefile,
+		    sizeof(timidity_cfgfile_path));
+		file_cutname(timidity_cfgfile_path);
+		file_catname(timidity_cfgfile_path, "timidity.cfg",
+		    sizeof(timidity_cfgfile_path));
+	}
 
 	dosio_init();
 	file_setcd(modulefile);
@@ -235,7 +242,7 @@ main(int argc, char *argv[])
 	if (soundmng_initialize() == SUCCESS) {
 		result = soundmng_pcmload(SOUND_PCMSEEK, file_getcd("fddseek.wav"));
 		if (!result) {
-			result = soundmng_pcmload(SOUND_PCMSEEK, SYSRESPATH "/fddseek.wav");
+			result = soundmng_pcmload(SOUND_PCMSEEK, SYSRESPATH "/wav/fddseek.wav");
 		}
 		if (result) {
 			soundmng_pcmvolume(SOUND_PCMSEEK, np2cfg.MOTORVOL);
@@ -243,7 +250,7 @@ main(int argc, char *argv[])
 
 		result = soundmng_pcmload(SOUND_PCMSEEK1, file_getcd("fddseek1.wav"));
 		if (!result) {
-			soundmng_pcmload(SOUND_PCMSEEK1, SYSRESPATH "/fddseek1.wav");
+			result = soundmng_pcmload(SOUND_PCMSEEK1, SYSRESPATH "/wav/fddseek1.wav");
 		}
 		if (result) {
 			soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL);