diff --git a/aoapplication.h b/aoapplication.h
index d1c3959..48a1858 100644
--- a/aoapplication.h
+++ b/aoapplication.h
@@ -43,8 +43,6 @@ public:
 
   unsigned int s_decryptor = 5;
   bool encryption_needed = true;
-  //T0D0: make this obsolete and break into smaller bools
-  bool ao2_features = false;
 
   bool yellow_text_enabled = false;
   bool prezoom_enabled = false;
diff --git a/courtroom.cpp b/courtroom.cpp
index b60a6e6..9a67bb9 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -910,7 +910,7 @@ void Courtroom::on_chat_return_pressed()
 
   if (text_color < 0)
     f_text_color = "0";
-  else if (text_color > 4 && !ao_app->ao2_features)
+  else if (text_color > 4 && !ao_app->yellow_text_enabled)
     f_text_color = "0";
   else
     f_text_color = QString::number(text_color);
@@ -1341,6 +1341,7 @@ void Courtroom::set_text_color()
   case YELLOW:
     ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
                                  "color: yellow");
+    break;
   default:
     qDebug() << "W: undefined text color: " << m_chatmessage[TEXT_COLOR];
   case WHITE:
diff --git a/packet_distribution.cpp b/packet_distribution.cpp
index 3a9e786..d56fc1e 100644
--- a/packet_distribution.cpp
+++ b/packet_distribution.cpp
@@ -69,6 +69,8 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
   }
   else if (header == "AO2CHECK")
   {
+    send_ms_packet(new AOPacket("ID#AO2#" + get_version_string() + "#%"));
+
     if (f_contents.size() < 1)
       goto end;
 
@@ -81,9 +83,6 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
     int f_major = version_contents.at(1).toInt();
     int f_minor = version_contents.at(2).toInt();
 
-    //qDebug() << "local version: " << get_version_string();
-    //qDebug() << "remote version: " << QString::number(f_release) << QString::number(f_major) << QString::number(f_minor);
-
     if (get_release() > f_release)
       goto end;
     else if (get_release() == f_release)