Renamed ShellWithCommandLine to Console, and some touch ups.