Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcCoverage.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcCoverage.java	(revision 240)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcCoverage.java	(revision 241)
@@ -34,16 +34,14 @@
 	public void run(List<Object> parameters) {
 		String modelname;
+		String observedName;
 		String[] sequenceNames;
 		int minLength;
 		int maxLength;
-		String observedName = "sequences";
 		try {
 			modelname = (String) parameters.get(0);
-			sequenceNames = (String[]) parameters.get(1);
-			minLength = Integer.parseInt((String) parameters.get(2));
-			maxLength = Integer.parseInt((String) parameters.get(3));
-			if (parameters.size() == 5) {
-				observedName = (String) parameters.get(4);
-			}
+			observedName = (String) parameters.get(1);
+			sequenceNames = (String[]) parameters.get(2);
+			minLength = Integer.parseInt((String) parameters.get(3));
+			maxLength = Integer.parseInt((String) parameters.get(4));
 		} catch (Exception e) {
 			throw new InvalidParameterException();
@@ -138,5 +136,5 @@
 	@Override
 	public void help() {
-		Console.println("Usage: calcCoverage <modelname> [sequenceNames] <minCovLength> <maxCovLength>");
+		Console.println("Usage: calcCoverage <modelname> <observedSequences> [sequenceNames] <minCovLength> <maxCovLength>");
 	}
 
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomSequences.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomSequences.java	(revision 240)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomSequences.java	(revision 241)
@@ -33,20 +33,16 @@
 		String sequencesName;
 		int numSessions;
-		long maxIter;
 		int minLength = 0;
 		int maxLength = Integer.MAX_VALUE;
+		long maxIter;
 		try {
 			modelname = (String) parameters.get(0);
 			sequencesName = (String) parameters.get(1);
 			numSessions = Integer.parseInt((String) parameters.get(2));
+			minLength = Integer.parseInt((String) parameters.get(3));
+			maxLength = Integer.parseInt((String) parameters.get(4));
 			maxIter = numSessions * 10;
-			if (parameters.size() >= 4) {
-				maxIter = Long.parseLong((String) parameters.get(3));
-			}
 			if (parameters.size() >= 5) {
-				minLength = Integer.parseInt((String) parameters.get(4));
-			}
-			if (parameters.size() >= 6) {
-				maxLength = Integer.parseInt((String) parameters.get(5));
+				maxIter = Long.parseLong((String) parameters.get(5));
 			}
 		} catch (Exception e) {
@@ -94,5 +90,5 @@
 	@Override
 	public void help() {
-		Console.println("Usage: generateRandomSequenecs <modelName> <sequencesName> <numSessions> {<maxIter> <minLength> <maxLength>}");
+		Console.println("Usage: generateRandomSequenecs <modelName> <sequencesName> <numSessions> <minLength> <maxLength> {<maxIter>}");
 	}
 
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateReplayfile.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateReplayfile.java	(revision 240)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateReplayfile.java	(revision 241)
@@ -30,5 +30,5 @@
 	@Override
 	public void help() {
-		Console.println("Usage: generateReplayfile <filename> {<sequences>}");
+		Console.println("Usage: generateReplayfile <filename> <sequences>");
 	}
 
@@ -41,11 +41,11 @@
 	@Override
 	public void run(List<Object> parameters) {
-		if (parameters.size() < 1) {
+		String filename;
+		String sequencesName;
+		try {
+			filename = (String) parameters.get(0);
+			sequencesName = (String) parameters.get(1);
+		} catch (Exception e) {
 			throw new InvalidParameterException();
-		}
-		String filename = (String) parameters.get(0);
-		String sequencesName = "sequences";
-		if (parameters.size() == 2) {
-			sequencesName = (String) parameters.get(1);
 		}
 
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDload.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDload.java	(revision 240)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDload.java	(revision 241)
@@ -56,5 +56,5 @@
 	@Override
 	public void help() {
-		Console.println("Usage: loadObject <filename>");
+		Console.println("Usage: load <filename>");
 	}
 
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintRandomSession.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintRandomSession.java	(revision 240)
+++ 	(revision )
@@ -1,65 +1,0 @@
-package de.ugoe.cs.eventbench.commands;
-
-import java.security.InvalidParameterException;
-import java.util.List;
-
-import de.ugoe.cs.eventbench.CommandHelpers;
-import de.ugoe.cs.eventbench.data.Event;
-import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.models.IStochasticProcess;
-import de.ugoe.cs.util.console.Command;
-import de.ugoe.cs.util.console.Console;
-
-/**
- * <p>
- * Command that prints a randomly generated sessions of events to the console.
- * </p>
- * 
- * @author Steffen Herbold
- * @version 1.0
- */
-public class CMDprintRandomSession implements Command {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.ugoe.cs.util.console.Command#help()
-	 */
-	@Override
-	public void help() {
-		Console.println("Usage: printRandomSession <modelName>");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.ugoe.cs.util.console.Command#run(java.util.List)
-	 */
-	@Override
-	public void run(List<Object> parameters) {
-		String modelname;
-		try {
-			modelname = (String) parameters.get(0);
-		} catch (Exception e) {
-			throw new InvalidParameterException();
-		}
-
-		IStochasticProcess model = null;
-		Object dataObject = GlobalDataContainer.getInstance()
-				.getData(modelname);
-		if (dataObject == null) {
-			CommandHelpers.objectNotFoundMessage(modelname);
-			return;
-		}
-		if (!(dataObject instanceof IStochasticProcess)) {
-			CommandHelpers.objectNotType(modelname, "IStochasticProcess");
-			return;
-		}
-
-		model = (IStochasticProcess) dataObject;
-		for (Event<?> event : model.randomSequence()) {
-			Console.println(event.toString());
-		}
-	}
-
-}
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsave.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsave.java	(revision 240)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsave.java	(revision 241)
@@ -54,5 +54,5 @@
 	@Override
 	public void help() {
-		Console.println("Usage: saveObject <filename>");
+		Console.println("Usage: save <filename>");
 	}
 
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsequenceStatistics.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsequenceStatistics.java	(revision 240)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDsequenceStatistics.java	(revision 241)
@@ -1,4 +1,5 @@
 package de.ugoe.cs.eventbench.commands;
 
+import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.List;
@@ -33,7 +34,9 @@
 	@Override
 	public void run(List<Object> parameters) {
-		String sequencesName = "sequences";
-		if (parameters.size() == 1) {
+		String sequencesName;
+		try {
 			sequencesName = (String) parameters.get(0);
+		} catch (Exception e) {
+			throw new InvalidParameterException();
 		}
 
@@ -52,5 +55,5 @@
 
 		sequences = (Collection<List<Event<?>>>) dataObject;
-		Console.traceln("Number of Sequences: " + sequences.size());
+		Console.println("Number of Sequences: " + sequences.size());
 		SortedMap<Integer, Integer> lengthMap = new TreeMap<Integer, Integer>();
 		for (List<Event<?>> sequence : sequences) {
@@ -63,5 +66,5 @@
 		}
 		for (Entry<Integer, Integer> entry : lengthMap.entrySet()) {
-			Console.traceln("Of length " + entry.getKey() + ": "
+			Console.println("Of length " + entry.getKey() + ": "
 					+ entry.getValue());
 		}
@@ -75,5 +78,5 @@
 	@Override
 	public void help() {
-		Console.println("Usage: sequenceStatistics {<sequencesName>}");
+		Console.println("Usage: sequenceStatistics <sequencesName>");
 	}
 
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowTimer.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowTimer.java	(revision 240)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowTimer.java	(revision 241)
@@ -46,5 +46,5 @@
 		long startTime = (Long) dataObject;
 		long currentTime = System.currentTimeMillis();
-		Console.println("" + (currentTime - startTime) + " miliseconds");
+		Console.println("" + (currentTime - startTime) + " milliseconds");
 	}
 
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadSessionsFromClickstream.java	(revision 240)
+++ 	(revision )
@@ -1,117 +1,0 @@
-package de.ugoe.cs.eventbench.web.commands;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.InvalidParameterException;
-import java.text.ParseException;
-import java.util.Collection;
-import java.util.List;
-
-import de.ugoe.cs.eventbench.CommandHelpers;
-import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.web.WeblogParser;
-import de.ugoe.cs.eventbench.web.data.WebEvent;
-import de.ugoe.cs.util.console.Command;
-import de.ugoe.cs.util.console.Console;
-
-/**
- * <p>
- * Command to load sessions from a web log.
- * </p>
- * 
- * @author Steffen Herbold
- * @version 1.0
- */
-public class CMDloadSessionsFromClickstream implements Command {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.ugoe.cs.util.console.Command#run(java.util.List)
-	 */
-	@Override
-	public void run(List<Object> parameters) {
-		if (parameters.size() < 1) {
-			throw new InvalidParameterException();
-		}
-		String source;
-		String sequencesName;
-		String serverUrl = null;
-		int timeout = -1;
-		int minLength = -1;
-		int maxLength = -1;
-		boolean generateFrequentUsers = false;
-		int frequentUserThreshold = 20;
-		try {
-			source = (String) parameters.get(0);
-			sequencesName = (String) parameters.get(1);
-			if (parameters.size() >= 3) {
-				serverUrl = (String) parameters.get(2);
-			}
-			if (parameters.size() >= 6) {
-				timeout = Integer.parseInt((String) parameters.get(3));
-				minLength = Integer.parseInt((String) parameters.get(4));
-				maxLength = Integer.parseInt((String) parameters.get(5));
-			}
-			if (parameters.size() >= 8) {
-				generateFrequentUsers = Boolean
-						.parseBoolean((String) parameters.get(6));
-				frequentUserThreshold = Integer.parseInt((String) parameters
-						.get(7));
-			}
-		} catch (Exception e) {
-			throw new InvalidParameterException();
-		}
-
-		WeblogParser parser = new WeblogParser();
-		if (serverUrl != null) {
-			parser.setUrl(serverUrl);
-		}
-		if (timeout != -1) {
-			parser.setTimeout(timeout);
-			parser.setMinLength(minLength);
-			parser.setMaxLength(maxLength);
-		}
-		if (generateFrequentUsers) {
-			parser.setFrequentUserThreshold(frequentUserThreshold);
-		}
-		try {
-			parser.parseFile(source);
-		} catch (FileNotFoundException e) {
-			Console.println(e.getMessage());
-		} catch (IOException e) {
-			Console.println(e.getMessage());
-		} catch (ParseException e) {
-			Console.println("Invalid format of date stamps.");
-			Console.println(e.getMessage());
-		}
-
-		if (GlobalDataContainer.getInstance().addData(sequencesName,
-				parser.getSequences())) {
-			CommandHelpers.dataOverwritten(sequencesName);
-		}
-		if (generateFrequentUsers) {
-			List<String> frequentUserIDs = parser.getFrequentUsers();
-			List<Collection<List<WebEvent>>> frequentUserSessions = parser
-					.getFrequentUserSequences();
-			for (int i = 0; i < frequentUserIDs.size(); i++) {
-				String seqName = sequencesName + "_" + frequentUserIDs.get(i);
-				if (GlobalDataContainer.getInstance().addData(seqName,
-						frequentUserSessions.get(i))) {
-					CommandHelpers.dataOverwritten(seqName);
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.ugoe.cs.util.console.Command#help()
-	 */
-	@Override
-	public void help() {
-		Console.println("Usage: loadSessionsFromClickstream <filename> <sequencesName> {<serverUrl>} {<timeout> <minSessionLength> <maxSessionLength>} {<generateFrequentUsers> <frequentUserThreshold>}");
-	}
-
-}
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadWebSequences.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadWebSequences.java	(revision 241)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/web/commands/CMDloadWebSequences.java	(revision 241)
@@ -0,0 +1,117 @@
+package de.ugoe.cs.eventbench.web.commands;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.InvalidParameterException;
+import java.text.ParseException;
+import java.util.Collection;
+import java.util.List;
+
+import de.ugoe.cs.eventbench.CommandHelpers;
+import de.ugoe.cs.eventbench.data.GlobalDataContainer;
+import de.ugoe.cs.eventbench.web.WeblogParser;
+import de.ugoe.cs.eventbench.web.data.WebEvent;
+import de.ugoe.cs.util.console.Command;
+import de.ugoe.cs.util.console.Console;
+
+/**
+ * <p>
+ * Command to load sessions from a web log.
+ * </p>
+ * 
+ * @author Steffen Herbold
+ * @version 1.0
+ */
+public class CMDloadWebSequences implements Command {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.ugoe.cs.util.console.Command#run(java.util.List)
+	 */
+	@Override
+	public void run(List<Object> parameters) {
+		if (parameters.size() < 1) {
+			throw new InvalidParameterException();
+		}
+		String source;
+		String sequencesName;
+		String serverUrl = null;
+		int timeout = -1;
+		int minLength = -1;
+		int maxLength = -1;
+		boolean generateFrequentUsers = false;
+		int frequentUserThreshold = 20;
+		try {
+			source = (String) parameters.get(0);
+			sequencesName = (String) parameters.get(1);
+			if (parameters.size() >= 3) {
+				serverUrl = (String) parameters.get(2);
+			}
+			if (parameters.size() >= 6) {
+				timeout = Integer.parseInt((String) parameters.get(3));
+				minLength = Integer.parseInt((String) parameters.get(4));
+				maxLength = Integer.parseInt((String) parameters.get(5));
+			}
+			if (parameters.size() >= 8) {
+				generateFrequentUsers = Boolean
+						.parseBoolean((String) parameters.get(6));
+				frequentUserThreshold = Integer.parseInt((String) parameters
+						.get(7));
+			}
+		} catch (Exception e) {
+			throw new InvalidParameterException();
+		}
+
+		WeblogParser parser = new WeblogParser();
+		if (serverUrl != null) {
+			parser.setUrl(serverUrl);
+		}
+		if (timeout != -1) {
+			parser.setTimeout(timeout);
+			parser.setMinLength(minLength);
+			parser.setMaxLength(maxLength);
+		}
+		if (generateFrequentUsers) {
+			parser.setFrequentUserThreshold(frequentUserThreshold);
+		}
+		try {
+			parser.parseFile(source);
+		} catch (FileNotFoundException e) {
+			Console.println(e.getMessage());
+		} catch (IOException e) {
+			Console.println(e.getMessage());
+		} catch (ParseException e) {
+			Console.println("Invalid format of date stamps.");
+			Console.println(e.getMessage());
+		}
+
+		if (GlobalDataContainer.getInstance().addData(sequencesName,
+				parser.getSequences())) {
+			CommandHelpers.dataOverwritten(sequencesName);
+		}
+		if (generateFrequentUsers) {
+			List<String> frequentUserIDs = parser.getFrequentUsers();
+			List<Collection<List<WebEvent>>> frequentUserSessions = parser
+					.getFrequentUserSequences();
+			for (int i = 0; i < frequentUserIDs.size(); i++) {
+				String seqName = sequencesName + "_" + frequentUserIDs.get(i);
+				if (GlobalDataContainer.getInstance().addData(seqName,
+						frequentUserSessions.get(i))) {
+					CommandHelpers.dataOverwritten(seqName);
+				}
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see de.ugoe.cs.util.console.Command#help()
+	 */
+	@Override
+	public void help() {
+		Console.println("Usage: loadWebSequences <filename> <sequencesName> {<serverUrl>} {<timeout> <minSessionLength> <maxSessionLength>} {<generateFrequentUsers> <frequentUserThreshold>}");
+	}
+
+}