Added Random. Added Command Line running.
Slight changes