diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp
index ecc741b88..b3550985f 100644
--- a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp
@@ -256,7 +256,7 @@ std::pair<DateFormat, DateTime> DateReader::read_date(Logger& logger, std::share
     if (!detect(*screen)){
         throw_and_log<OperationFailedException>(
             logger, ErrorReport::SEND_ERROR_REPORT,
-            "Not on data change screen.",
+            "Not on date change screen.",
             nullptr,
             std::move(screen)
         );
@@ -267,7 +267,7 @@ std::pair<DateFormat, DateTime> DateReader::read_date(Logger& logger, std::share
     if (stats_window_top.stddev.sum() > 10){
         throw_and_log<OperationFailedException>(
             logger, ErrorReport::SEND_ERROR_REPORT,
-            "Not on data change screen.",
+            "Not on date change screen.",
             nullptr,
             std::move(screen)
         );
@@ -592,7 +592,7 @@ void change_date(
         HomeWatcher home;
         DateChangeWatcher date_reader;
         int ret = wait_until(
-            env.console, context, std::chrono::seconds(120),
+            env.console, context, std::chrono::seconds(10),
             {
                 home,
                 date_reader
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
index e00a6e44c..74ddf3b6f 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
+++ b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
@@ -106,39 +106,6 @@ void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBase
         results.balls_used,
         results.result
     );
-
-#if 0
-    while (true)
-    {
-        NormalBattleMenuWatcher battle_menu(COLOR_RED);
-        int ret = wait_until(
-            env.console, context,
-            std::chrono::seconds(120),
-            {
-                battle_menu,
-            }
-        );
-
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            throw_ball(env.console, context);
-            stats.m_balls++;
-            env.update_stats();
-            break;
-        default:
-            throw FatalProgramException(
-                env.console, ErrorReport::SEND_ERROR_REPORT,
-                "Failed to detect battle menu after 60 seconds, did you catch or fail?",
-                true
-            );
-        }
-
-    }
-#endif
-
-//    env.update_stats();
-//    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
 }