--- /usr/bin/igal	2005-10-24 21:34:10.000000000 +0100
+++ ./igal	2005-10-24 21:46:57.000000000 +0100
@@ -278,7 +278,7 @@
 			chomp($line); $line =~ s/^\s*//; $line =~ s/\s*$//;
 			# only read lines with the ---- delimiter that don't start with #
 			if (($line =~ m/\w\s*----\s*/) && !($line =~ m/^\#/)) {
-				@arr = split(/\s*----\s*/,$line);
+				@arr = split(/\s*----\s*/,$line,2);
 				# first check image extensions
 				$temp = $arr[0]; $temp =~ s/^.*\.//;
 				push(@imgfiles,$arr[0]);
@@ -448,7 +448,7 @@
 	@slides = ();
 	if ($opt_n) {                       # decide on the slide html file names
 		for ($i = 0; $i < $nfiles; $i++) {
-			$temp = $safenames[$i];
+			$temp = $imgfiles[$i];
 			$temp =~ s/\..+?$/\.html/;
 			push(@slides,$temp);
 		}
@@ -473,7 +473,7 @@
 	
 	print "Creating individual slides: ";
 	for ($i = 0; $i < $nfiles; $i++) {
-		open(SW,">$opt_d/$slides[$i]") or die "Can't create slide file\n";
+		open(SW,">","$opt_d/$slides[$i]") or die "Can't create slide file\n";
 		print ".";
 		if ($opt_k) {    # use image caption for the HTML slide title
 			$title = $captions[$i];