diff --git a/application/.settings/language.settings.xml b/application/.settings/language.settings.xml
index 77a814f..b8e6820 100644
--- a/application/.settings/language.settings.xml
+++ b/application/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1389455286487884947" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="574610649672696033" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1414503461445076851" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="599658824629887937" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/application/Release/src/subdir.mk b/application/Release/src/subdir.mk
index 9c47e8c..6316e8e 100644
--- a/application/Release/src/subdir.mk
+++ b/application/Release/src/subdir.mk
@@ -17,7 +17,6 @@ CPP_SRCS += \
 ../src/Events.cpp \
 ../src/GPS.cpp \
 ../src/LEDManager.cpp \
-../src/MenuScreens.cpp \
 ../src/NMEAEncoder.cpp \
 ../src/NMEASentence.cpp \
 ../src/NoiseFloorDetector.cpp \
@@ -44,7 +43,6 @@ OBJS += \
 ./src/Events.o \
 ./src/GPS.o \
 ./src/LEDManager.o \
-./src/MenuScreens.o \
 ./src/NMEAEncoder.o \
 ./src/NMEASentence.o \
 ./src/NoiseFloorDetector.o \
@@ -75,7 +73,6 @@ CPP_DEPS += \
 ./src/Events.d \
 ./src/GPS.d \
 ./src/LEDManager.d \
-./src/MenuScreens.d \
 ./src/NMEAEncoder.d \
 ./src/NMEASentence.d \
 ./src/NoiseFloorDetector.d \
diff --git a/application/src/DataTerminal.cpp b/application/src/DataTerminal.cpp
index b4829f1..1bb0854 100644
--- a/application/src/DataTerminal.cpp
+++ b/application/src/DataTerminal.cpp
@@ -9,7 +9,6 @@
 
 #include "stm32f30x.h"
 #include "printf2.h"
-#include "MenuScreens.hpp"
 #include "Events.hpp"
 #include <stdio.h>
 #include "Utils.hpp"
diff --git a/application/src/MenuScreens.cpp b/application/src/MenuScreens.cpp
deleted file mode 100644
index 52c0954..0000000
--- a/application/src/MenuScreens.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * MenuScreens.cpp
- *
- *  Created on: Apr 19, 2016
- *      Author: peter
- */
-
-
-
-
diff --git a/application/src/MenuScreens.hpp b/application/src/MenuScreens.hpp
deleted file mode 100644
index da411fe..0000000
--- a/application/src/MenuScreens.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * MenuScreens.hpp
- *
- *  Created on: Apr 19, 2016
- *      Author: peter
- */
-
-#ifndef MENUSCREENS_HPP_
-#define MENUSCREENS_HPP_
-
-
-
-
-
-#endif /* MENUSCREENS_HPP_ */
diff --git a/application/src/TXPowerSettings.h b/application/src/TXPowerSettings.h
index c40251a..df40f9f 100644
--- a/application/src/TXPowerSettings.h
+++ b/application/src/TXPowerSettings.h
@@ -23,7 +23,7 @@
 #include <inttypes.h>
 
 /*
- * Table settings derived from Silabs AN 900. Enumeration is for convenience and type safety. PWR_PXX = +XXdBm, PWR_MXX = -XXdBm
+ * Table settings derived from Silabs AN900. Enumeration is for convenience and type safety. PWR_PXX = +XXdBm, PWR_MXX = -XXdBm
  */
 
 typedef enum {
diff --git a/application/src/globals.h b/application/src/globals.h
index 669956f..6298b3d 100644
--- a/application/src/globals.h
+++ b/application/src/globals.h
@@ -55,7 +55,7 @@
 #define MAX_AIS_TX_PACKET_SIZE      1280
 #else
 // As a class B transponder, we never transmit anything bigger than 240 bits.
-#define MAX_AIS_TX_PACKET_SIZE       300
+#define MAX_AIS_TX_PACKET_SIZE       256
 #endif
 
 // Maximum allowed backlog in TX queue
@@ -71,7 +71,7 @@
 #define MSG_24_TX_INTERVAL           360
 
 // The spec calls for Class B transmitters to listen for the first 20 bits of each frame before transmitting.
-// It takes the Si4463 a few bits' time to switch from RX to TX, so I arbitrarily picked the 12th bit.
+// It takes the Si4463 a few bits' time to switch from RX to TX, so I arbitrarily picked the 12th bit instead.
 #define CCA_SLOT_BIT                  11
 
 // Extra debugging using halting assertions