diff --git a/pumpkin/Cargo.toml b/pumpkin/Cargo.toml
index 4e2648f60..d11c703af 100644
--- a/pumpkin/Cargo.toml
+++ b/pumpkin/Cargo.toml
@@ -44,6 +44,9 @@ rand = "0.8.5"
 
 num-bigint = "0.4"
 
+# Console line reading
+rustyline = "15.0.0"
+
 # encryption
 rsa = "0.9.7"
 rsa-der = "0.3.0"
diff --git a/pumpkin/src/command/args/players.rs b/pumpkin/src/command/args/players.rs
index fefeac3fe..7c71e690b 100644
--- a/pumpkin/src/command/args/players.rs
+++ b/pumpkin/src/command/args/players.rs
@@ -72,7 +72,7 @@ impl ArgumentConsumer for PlayersArgumentConsumer {
 
 impl DefaultNameArgConsumer for PlayersArgumentConsumer {
     fn default_name(&self) -> &'static str {
-        "player"
+        "target"
     }
 }
 
diff --git a/pumpkin/src/command/commands/give.rs b/pumpkin/src/command/commands/give.rs
index d40f7a6cc..c7b306c4a 100644
--- a/pumpkin/src/command/commands/give.rs
+++ b/pumpkin/src/command/commands/give.rs
@@ -19,8 +19,8 @@ const ARG_ITEM: &str = "item";
 fn item_count_consumer() -> BoundedNumArgumentConsumer<i32> {
     BoundedNumArgumentConsumer::new()
         .name("count")
-        .min(0)
-        .max(6400)
+        .min(1)
+        .max(i32::MAX)
 }
 
 struct GiveExecutor;
diff --git a/pumpkin/src/lib.rs b/pumpkin/src/lib.rs
index 228be74ac..cd23f5709 100644
--- a/pumpkin/src/lib.rs
+++ b/pumpkin/src/lib.rs
@@ -3,12 +3,13 @@ use crate::server::{ticker::Ticker, Server};
 use plugin::PluginManager;
 use pumpkin_config::{ADVANCED_CONFIG, BASIC_CONFIG};
 use pumpkin_util::text::TextComponent;
+use rustyline::DefaultEditor;
 use std::{
     net::SocketAddr,
     sync::{Arc, LazyLock},
 };
 use tokio::{
-    io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader},
+    io::{AsyncReadExt, AsyncWriteExt},
     net::{tcp::OwnedReadHalf, TcpListener},
     sync::Mutex,
 };
@@ -183,24 +184,23 @@ impl PumpkinServer {
 
 fn setup_console(server: Arc<Server>) {
     tokio::spawn(async move {
-        let stdin = tokio::io::stdin();
-        let mut reader = BufReader::new(stdin);
+        let mut rl = DefaultEditor::new().unwrap();
         loop {
-            let mut out = String::new();
+            // maybe put this into config ?
+            let readline = rl.readline("$ ");
 
-            reader
-                .read_line(&mut out)
-                .await
-                .expect("Failed to read console line");
-
-            if !out.is_empty() {
-                let server_clone = server.clone();
-                tokio::spawn(async move {
-                    let dispatcher = server_clone.command_dispatcher.read().await;
+            match readline {
+                Ok(line) => {
+                    rl.add_history_entry(line.as_str()).unwrap();
+                    let dispatcher = server.command_dispatcher.read().await;
                     dispatcher
-                        .handle_command(&mut command::CommandSender::Console, &server_clone, &out)
+                        .handle_command(&mut command::CommandSender::Console, &server, &line)
                         .await;
-                });
+                }
+                Err(_) => {
+                    // TODO: we can handle CTRL+C and stuff here
+                    break;
+                }
             }
         }
     });