Changed CLIInput, CLIOutput, added some things ...