diff --git a/README.md b/README.md
index cc99747..a94d6fc 100644
--- a/README.md
+++ b/README.md
@@ -25,11 +25,37 @@ If you're using Visual Studio, just go in the sdk folder and read the readme the
 If you are using any other compiler, good luck getting the dependencies somehow. Usually you'll have some sort of package manager that can get the stuff for you.
 
 ## Build System
-
+### Windows
 If you are using Visual Studio, just open up the solution.
 Make sure you switch to release mode and use 64bit mode.
-If you are using any other compiler, there are cmake files.
-Good luck.
+
+### Mac OS X
+Use [brew](http://brew.sh/) to install the following packages.
+* lz4
+* glfw
+
+Because the CMake files are fucked, you'll have to run cmake with an additional parameter. This is because cmake doesn't know where to find the path containing glfwConfig.cmake and the glfw dylib.  
+Also, even though this might compile successfully, you'll probably need to set to use libcxx.
+```
+export glfw_DIR=src/client/CMake/Modules
+cmake . -DGLFW_LIBRARY=/usr/local/lib/libglfw3.3.1.dylib -USE_LIBCXX
+```
+Obviously, change up the version to whichever you brew installed.
+
+Then, if that went well, run the make command.
+if you get the error
+```
+/prog/NoLifeStory/src/nx/bitmap.cpp:20:10: fatal error: 
+      'lz4.h' file not found
+#include <lz4.h>
+```
+or something similar, you probably don't have the include and lib paths defined.
+Place the following lines in ~/.bash_profile, and restart your terminal.
+```
+export LIBRARY_PATH=/usr/local/lib/
+export CPLUS_INCLUDE_PATH=/usr/local/include/
+```
+Run the make command again, and it should work.
 
 ## NX Files
 
diff --git a/src/wztonx/wztonx.cpp b/src/wztonx/wztonx.cpp
index 5af7f64..8d2a8c9 100644
--- a/src/wztonx/wztonx.cpp
+++ b/src/wztonx/wztonx.cpp
@@ -51,7 +51,7 @@ namespace sys = boost::filesystem;
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <locale>
+#include <clocale>
 #include <map>
 #include <numeric>
 #include <regex>
@@ -299,7 +299,7 @@ struct wztonx {
     std::string str_buf;
     std::u16string wstr_buf;
 #ifndef NL_NO_CODECVT
-    std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> convert;
+    std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
 #endif
     char8_t const * u8key = nullptr;
     char16_t const * u16key = nullptr;
@@ -316,8 +316,7 @@ struct wztonx {
     // Methods
     std::string convert_str(std::u16string const & p_str) {
 #ifndef NL_NO_CODECVT
-        auto ptr = reinterpret_cast<wchar_t const *>(p_str.c_str());
-        return convert.to_bytes(ptr, ptr + p_str.size());
+    return convert.to_bytes(p_str);
 #else
         std::array<char, 0x10000> buf;
         std::wstring wbuf{p_str.cbegin(), p_str.cend()};
@@ -327,7 +326,7 @@ struct wztonx {
     }
     id_t add_string(std::string str) {
         if (str.length() > std::numeric_limits<uint16_t>::max())
-            throw std::runtime_error("String is too long!");
+            return add_string("This string was too long. Go fuck yourself."); 
         uint32_t hash = 2166136261u;
         for (auto c : str) {
             hash ^= c;
@@ -345,6 +344,7 @@ struct wztonx {
             auto slen = len == 127 ? in.read<uint32_t>() : len;
             auto ows = reinterpret_cast<char16_t const *>(in.offset);
             in.skip(slen * 2u);
+            if (slen > std::numeric_limits<uint16_t>::max()) { return add_string("This string was too long. Go fuck yourself."); }
             auto mask = 0xAAAAu;
             wstr_buf.resize(slen);
             for (auto i = 0u; i < slen; ++i, ++mask)
@@ -355,6 +355,7 @@ struct wztonx {
             auto slen = len == -128 ? in.read<uint32_t>() : -len;
             auto os = reinterpret_cast<char8_t const *>(in.offset);
             in.skip(slen);
+        if (slen > std::numeric_limits<uint16_t>::max()) { return add_string("This string was too long. Go fuck yourself."); }
             auto mask = 0xAAu;
             str_buf.resize(slen);
             for (auto i = 0u; i < slen; ++i, ++mask)