diff --git a/AUTHORS b/AUTHORS
index 7c10c6cd..915355b6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,3 @@
-tinythread++ library taken verbatim from:
-http://tinythread.sourceforge.net
+All code was written by DDVTECH employees specifically for this project, with the exception of:
 
-All other code so far was written by DDVTECH employees.
+* tinythread++ library taken verbatim from: http://tinythread.sourceforge.net
diff --git a/Makefile.am b/Makefile.am
index 6cf1b795..e1d5774b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,5 @@
 SUBDIRS=lib src
 EXTRA_DIST=server.html
+docs:
+	doxygen ./Doxyfile > /dev/null
+.PHONY: docs
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d7a351a3..265f87da 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LIBRARIES=libamf.a libauth.a libbase64.a libconfig.a libcrypto.a libdtsc.a libflv_tag.a libhttp_parser.a libjson.a libmd5.a libprocs.a librtmpchunks.a libsocket.a libtinythread.a libmp4.a
+noinst_LIBRARIES=libamf.a libauth.a libbase64.a libconfig.a libcrypto.a libdtsc.a libflv_tag.a libhttp_parser.a libjson.a libprocs.a librtmpchunks.a libsocket.a libtinythread.a libmp4.a
 libamf_a_SOURCES=amf.h amf.cpp
 libauth_a_SOURCES=auth.h auth.cpp
 libbase64_a_SOURCES=base64.h base64.cpp
@@ -8,7 +8,6 @@ libdtsc_a_SOURCES=dtsc.h dtsc.cpp
 libflv_tag_a_SOURCES=flv_tag.h flv_tag.cpp
 libhttp_parser_a_SOURCES=http_parser.h http_parser.cpp
 libjson_a_SOURCES=json.h json.cpp
-libmd5_a_SOURCES=md5.h md5.cpp
 libprocs_a_SOURCES=procs.h procs.cpp
 librtmpchunks_a_SOURCES=rtmpchunks.h rtmpchunks.cpp
 libsocket_a_SOURCES=socket.h socket.cpp
diff --git a/lib/base64.cpp b/lib/base64.cpp
index 0111823f..a2c9dec3 100644
--- a/lib/base64.cpp
+++ b/lib/base64.cpp
@@ -32,7 +32,7 @@ std::string Base64::encode(std::string const input) {
 }//base64_encode
 
 /// Used to base64 decode data. Input is the encoded data as std::string, output is the plaintext data as std::string.
-/// \param input Base64 encoded data to decode.
+/// \param encoded_string Base64 encoded data to decode.
 /// \returns Plaintext decoded data.
 std::string Base64::decode(std::string const& encoded_string) {
   int in_len = encoded_string.size();
diff --git a/lib/md5.cpp b/lib/md5.cpp
deleted file mode 100644
index cdeb5e33..00000000
--- a/lib/md5.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-/* MD5
- converted to C++ class by Frank Thilo (thilo@unix-ag.org)
- for bzflag (http://www.bzflag.org)
-
-   based on:
-
-   md5.h and md5.c
-   reference implemantion of RFC 1321
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
-*/
-
-/* interface header */
-#include "md5.h"
-
-/* system implementation headers */
-#include <stdio.h>
-
-
-// Constants for MD5Transform routine.
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-///////////////////////////////////////////////
-
-// F, G, H and I are basic MD5 functions.
-inline MD5::uint4 MD5::F(uint4 x, uint4 y, uint4 z) {
-  return x&y | ~x&z;
-}
-
-inline MD5::uint4 MD5::G(uint4 x, uint4 y, uint4 z) {
-  return x&z | y&~z;
-}
-
-inline MD5::uint4 MD5::H(uint4 x, uint4 y, uint4 z) {
-  return x^y^z;
-}
-
-inline MD5::uint4 MD5::I(uint4 x, uint4 y, uint4 z) {
-  return y ^ (x | ~z);
-}
-
-// rotate_left rotates x left n bits.
-inline MD5::uint4 MD5::rotate_left(uint4 x, int n) {
-  return (x << n) | (x >> (32-n));
-}
-
-// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-// Rotation is separate from addition to prevent recomputation.
-inline void MD5::FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-  a = rotate_left(a+ F(b,c,d) + x + ac, s) + b;
-}
-
-inline void MD5::GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-  a = rotate_left(a + G(b,c,d) + x + ac, s) + b;
-}
-
-inline void MD5::HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-  a = rotate_left(a + H(b,c,d) + x + ac, s) + b;
-}
-
-inline void MD5::II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-  a = rotate_left(a + I(b,c,d) + x + ac, s) + b;
-}
-
-//////////////////////////////////////////////
-
-// default ctor, just initailize
-MD5::MD5()
-{
-  init();
-}
-
-//////////////////////////////////////////////
-
-// nifty shortcut ctor, compute MD5 for string and finalize it right away
-MD5::MD5(const std::string &text)
-{
-  init();
-  update(text.c_str(), text.length());
-  finalize();
-}
-
-//////////////////////////////
-
-void MD5::init()
-{
-  finalized=false;
-
-  count[0] = 0;
-  count[1] = 0;
-
-  // load magic initialization constants.
-  state[0] = 0x67452301;
-  state[1] = 0xefcdab89;
-  state[2] = 0x98badcfe;
-  state[3] = 0x10325476;
-}
-
-//////////////////////////////
-
-// decodes input (unsigned char) into output (uint4). Assumes len is a multiple of 4.
-void MD5::decode(uint4 output[], const uint1 input[], size_type len)
-{
-  for (unsigned int i = 0, j = 0; j < len; i++, j += 4)
-    output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) |
-      (((uint4)input[j+2]) << 16) | (((uint4)input[j+3]) << 24);
-}
-
-//////////////////////////////
-
-// encodes input (uint4) into output (unsigned char). Assumes len is
-// a multiple of 4.
-void MD5::encode(uint1 output[], const uint4 input[], size_type len)
-{
-  for (size_type i = 0, j = 0; j < len; i++, j += 4) {
-    output[j] = input[i] & 0xff;
-    output[j+1] = (input[i] >> 8) & 0xff;
-    output[j+2] = (input[i] >> 16) & 0xff;
-    output[j+3] = (input[i] >> 24) & 0xff;
-  }
-}
-
-//////////////////////////////
-
-// apply MD5 algo on a block
-void MD5::transform(const uint1 block[blocksize])
-{
-  uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-  decode (x, block, blocksize);
-
-  /* Round 1 */
-  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
-  /* Round 2 */
-  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-  state[0] += a;
-  state[1] += b;
-  state[2] += c;
-  state[3] += d;
-
-  // Zeroize sensitive information.
-  memset(x, 0, sizeof x);
-}
-
-//////////////////////////////
-
-// MD5 block update operation. Continues an MD5 message-digest
-// operation, processing another message block
-void MD5::update(const unsigned char input[], size_type length)
-{
-  // compute number of bytes mod 64
-  size_type index = count[0] / 8 % blocksize;
-
-  // Update number of bits
-  if ((count[0] += (length << 3)) < (length << 3))
-    count[1]++;
-  count[1] += (length >> 29);
-
-  // number of bytes we need to fill in buffer
-  size_type firstpart = 64 - index;
-
-  size_type i;
-
-  // transform as many times as possible.
-  if (length >= firstpart)
-  {
-    // fill buffer first, transform
-    memcpy(&buffer[index], input, firstpart);
-    transform(buffer);
-
-    // transform chunks of blocksize (64 bytes)
-    for (i = firstpart; i + blocksize <= length; i += blocksize)
-      transform(&input[i]);
-
-    index = 0;
-  }
-  else
-    i = 0;
-
-  // buffer remaining input
-  memcpy(&buffer[index], &input[i], length-i);
-}
-
-//////////////////////////////
-
-// for convenience provide a verson with signed char
-void MD5::update(const char input[], size_type length)
-{
-  update((const unsigned char*)input, length);
-}
-
-//////////////////////////////
-
-// MD5 finalization. Ends an MD5 message-digest operation, writing the
-// the message digest and zeroizing the context.
-MD5& MD5::finalize()
-{
-  static unsigned char padding[64] = {
-    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-  };
-
-  if (!finalized) {
-    // Save number of bits
-    unsigned char bits[8];
-    encode(bits, count, 8);
-
-    // pad out to 56 mod 64.
-    size_type index = count[0] / 8 % 64;
-    size_type padLen = (index < 56) ? (56 - index) : (120 - index);
-    update(padding, padLen);
-
-    // Append length (before padding)
-    update(bits, 8);
-
-    // Store state in digest
-    encode(digest, state, 16);
-
-    // Zeroize sensitive information.
-    memset(buffer, 0, sizeof buffer);
-    memset(count, 0, sizeof count);
-
-    finalized=true;
-  }
-
-  return *this;
-}
-
-//////////////////////////////
-
-// return hex representation of digest as string
-std::string MD5::hexdigest() const
-{
-  if (!finalized)
-    return "";
-
-  char buf[33];
-  for (int i=0; i<16; i++)
-    sprintf(buf+i*2, "%02x", digest[i]);
-  buf[32]=0;
-
-  return std::string(buf);
-}
-
-//////////////////////////////
-
-std::ostream& operator<<(std::ostream& out, MD5 md5)
-{
-  return out << md5.hexdigest();
-}
-
-//////////////////////////////
-
-std::string md5(const std::string str)
-{
-    MD5 md5 = MD5(str);
-
-    return md5.hexdigest();
-}
diff --git a/lib/md5.h b/lib/md5.h
deleted file mode 100644
index 3d7cac95..00000000
--- a/lib/md5.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* MD5
- converted to C++ class by Frank Thilo (thilo@unix-ag.org)
- for bzflag (http://www.bzflag.org)
-
-   based on:
-
-   md5.h and md5.c
-   reference implementation of RFC 1321
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
-*/
-
-#ifndef BZF_MD5_H
-#define BZF_MD5_H
-
-#include <string>
-#include <iostream>
-#include <cstring>
-
-// a small class for calculating MD5 hashes of strings or byte arrays
-// it is not meant to be fast or secure
-//
-// usage: 1) feed it blocks of uchars with update()
-//      2) finalize()
-//      3) get hexdigest() string
-//      or
-//      MD5(std::string).hexdigest()
-//
-// assumes that char is 8 bit and int is 32 bit
-class MD5
-{
-public:
-  typedef unsigned int size_type; // must be 32bit
-
-  MD5();
-  MD5(const std::string& text);
-  void update(const unsigned char *buf, size_type length);
-  void update(const char *buf, size_type length);
-  MD5& finalize();
-  std::string hexdigest() const;
-  friend std::ostream& operator<<(std::ostream&, MD5 md5);
-
-private:
-  void init();
-  typedef unsigned char uint1; //  8bit
-  typedef unsigned int uint4;  // 32bit
-  enum {blocksize = 64}; // VC6 won't eat a const static int here
-
-  void transform(const uint1 block[blocksize]);
-  static void decode(uint4 output[], const uint1 input[], size_type len);
-  static void encode(uint1 output[], const uint4 input[], size_type len);
-
-  bool finalized;
-  uint1 buffer[blocksize]; // bytes that didn't fit in last 64 byte chunk
-  uint4 count[2];   // 64bit counter for number of bits (lo, hi)
-  uint4 state[4];   // digest so far
-  uint1 digest[16]; // the result
-
-  // low level logic operations
-  static inline uint4 F(uint4 x, uint4 y, uint4 z);
-  static inline uint4 G(uint4 x, uint4 y, uint4 z);
-  static inline uint4 H(uint4 x, uint4 y, uint4 z);
-  static inline uint4 I(uint4 x, uint4 y, uint4 z);
-  static inline uint4 rotate_left(uint4 x, int n);
-  static inline void FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-  static inline void GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-  static inline void HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-  static inline void II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-};
-
-std::string md5(const std::string str);
-
-#endif
diff --git a/lib/tinythread.h b/lib/tinythread.h
index 723370cf..494e1ec4 100644
--- a/lib/tinythread.h
+++ b/lib/tinythread.h
@@ -24,37 +24,6 @@ freely, subject to the following restrictions:
 #ifndef _TINYTHREAD_H_
 #define _TINYTHREAD_H_
 
-/// @file
-/// @mainpage TinyThread++ API Reference
-///
-/// @section intro_sec Introduction
-/// TinyThread++ is a minimal, portable implementation of basic threading
-/// classes for C++.
-///
-/// They closely mimic the functionality and naming of the C++0x standard, and
-/// should be easily replaceable with the corresponding std:: variants.
-///
-/// @section port_sec Portability
-/// The Win32 variant uses the native Win32 API for implementing the thread
-/// classes, while for other systems, the POSIX threads API (pthread) is used.
-///
-/// @section class_sec Classes
-/// In order to mimic the threading API of the C++0x standard, subsets of
-/// several classes are provided. The fundamental classes are:
-/// @li tthread::thread
-/// @li tthread::mutex
-/// @li tthread::recursive_mutex
-/// @li tthread::condition_variable
-/// @li tthread::lock_guard
-/// @li tthread::fast_mutex
-///
-/// @section misc_sec Miscellaneous
-/// The following special keywords are available: #thread_local.
-///
-/// For more detailed information (including additional classes), browse the
-/// different sections of this documentation. A good place to start is:
-/// tinythread.h.
-
 // Which platform are we on?
 #if !defined(_TTHREAD_PLATFORM_DEFINED_)
   #if defined(_WIN32) || defined(__WIN32__) || defined(__WINDOWS__)
@@ -106,27 +75,6 @@ freely, subject to the following restrictions:
       name& operator=(const name&);
 #endif
 
-/// @def thread_local
-/// Thread local storage keyword.
-/// A variable that is declared with the \c thread_local keyword makes the
-/// value of the variable local to each thread (known as thread-local storage,
-/// or TLS). Example usage:
-/// @code
-/// // This variable is local to each thread.
-/// thread_local int variable;
-/// @endcode
-/// @note The \c thread_local keyword is a macro that maps to the corresponding
-/// compiler directive (e.g. \c __declspec(thread)). While the C++0x standard
-/// allows for non-trivial types (e.g. classes with constructors and
-/// destructors) to be declared with the \c thread_local keyword, most pre-C++0x
-/// compilers only allow for trivial types (e.g. \c int). So, to guarantee
-/// portable code, only use trivial types for thread local storage.
-/// @note This directive is currently not supported on Mac OS X (it will give
-/// a compiler error), since compile-time TLS is not supported in the Mac OS X
-/// executable format. Also, some older versions of MinGW (before GCC 4.x) do
-/// not support this directive.
-/// @hideinitializer
-
 #if !defined(_TTHREAD_CPP0X_) && !defined(thread_local)
  #if defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
   #define thread_local __thread
diff --git a/src/Makefile.am b/src/Makefile.am
index d9428214..414350a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,10 @@
 SUBDIRS=converters analysers
 bin_PROGRAMS=MistBuffer MistController MistConnRAW MistConnRTMP MistConnHTTP
 AM_LDFLAGS=-L../lib
-MistBuffer_SOURCES=buffer.cpp buffer_stats.h buffer_stats.cpp buffer_user.h buffer_user.cpp buffer_stream.h buffer_stream.cpp
+MistBuffer_SOURCES=buffer.cpp buffer_user.h buffer_user.cpp buffer_stream.h buffer_stream.cpp
 MistBuffer_LDADD=-ljson -lsocket -ldtsc -ltinythread -lpthread
 MistController_SOURCES=controller.cpp
-MistController_LDADD=-ljson -lsocket -lprocs -lmd5 -lconfig -lhttp_parser -lauth -lbase64 -lssl -lcrypto
+MistController_LDADD=-ljson -lsocket -lprocs -lconfig -lhttp_parser -lauth -lbase64 -lssl -lcrypto
 MistConnRAW_SOURCES=conn_raw.cpp
 MistConnRAW_LDADD=-lsocket
 MistConnRTMP_SOURCES=conn_rtmp.cpp server_setup.h
diff --git a/src/analysers/amf_analyser.cpp b/src/analysers/amf_analyser.cpp
index a03519d6..3a536f71 100644
--- a/src/analysers/amf_analyser.cpp
+++ b/src/analysers/amf_analyser.cpp
@@ -1,4 +1,4 @@
-/// \file AMF_Tester/main.cpp
+/// \file amf_analyser.cpp
 /// Debugging tool for AMF data.
 /// Expects AMF data through stdin, outputs human-readable information to stderr.
 
diff --git a/src/analysers/dtsc_analyser.cpp b/src/analysers/dtsc_analyser.cpp
index 9be443cb..d31df1f5 100644
--- a/src/analysers/dtsc_analyser.cpp
+++ b/src/analysers/dtsc_analyser.cpp
@@ -1,4 +1,4 @@
-/// \file DTSC_Analyser/main.cpp
+/// \file dtsc_analyser.cpp
 /// Contains the code for the DTSC Analysing tool.
 
 #include <fcntl.h>
diff --git a/src/analysers/flv_analyser.cpp b/src/analysers/flv_analyser.cpp
index 8af413d5..cefba5c7 100644
--- a/src/analysers/flv_analyser.cpp
+++ b/src/analysers/flv_analyser.cpp
@@ -1,5 +1,5 @@
-/// \file DTSC_Analyser/main.cpp
-/// Contains the code for the DTSC Analysing tool.
+/// \file flv_analyser.cpp
+/// Contains the code for the FLV Analysing tool.
 
 #include <fcntl.h>
 #include <iostream>
@@ -12,40 +12,12 @@
 #include <signal.h>
 #include "../../lib/flv_tag.h" //FLV support
 
-/// Reads DTSC from stdin and outputs human-readable information to stderr.
+/// Reads FLV from stdin and outputs human-readable information to stderr.
 int main() {
-
   FLV::Tag FLV_in; // Temporary storage for incoming FLV data.
-  
-
   while (!feof(stdin)){
     if (FLV_in.FileLoader(stdin)){
       std::cout << "Tag: " << FLV_in.tagType() << std::endl;
-      printf("%hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX\n", FLV_in.data[11], FLV_in.data[12], FLV_in.data[13], FLV_in.data[14], FLV_in.data[15], FLV_in.data[16], FLV_in.data[17], FLV_in.data[18], FLV_in.data[19], FLV_in.data[20]);
-      printf("%hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX %hhX\n", FLV_in.data[FLV_in.len-10], FLV_in.data[FLV_in.len-9], FLV_in.data[FLV_in.len-8], FLV_in.data[FLV_in.len-7], FLV_in.data[FLV_in.len-6], FLV_in.data[FLV_in.len-5], FLV_in.data[FLV_in.len-4], FLV_in.data[FLV_in.len-3], FLV_in.data[FLV_in.len-2], FLV_in.data[FLV_in.len-1]);
-      std::cout << std::endl;
-    }
-  }
-
-      
-  DTSC::Stream Strm;
-
-  std::string inBuffer;
-  char charBuffer[1024*10];
-  unsigned int charCount;
-  bool doneheader = false;
-
-  while(std::cin.good()){
-    //invalidate the current buffer
-    std::cin.read(charBuffer, 1024*10);
-    charCount = std::cin.gcount();
-    inBuffer.append(charBuffer, charCount);
-    if (Strm.parsePacket(inBuffer)){
-      if (!doneheader){
-        doneheader = true;
-        Strm.metadata.Print();
-      }
-      Strm.getPacket().Print();
     }
   }
   return 0;
diff --git a/src/analysers/rtmp_analyser.cpp b/src/analysers/rtmp_analyser.cpp
index 72d34970..4bc4e85c 100644
--- a/src/analysers/rtmp_analyser.cpp
+++ b/src/analysers/rtmp_analyser.cpp
@@ -1,4 +1,4 @@
-/// \file RTMP_Parser/main.cpp
+/// \file rtmp_analyser.cpp
 /// Debugging tool for RTMP data.
 /// Expects RTMP data of one side of the conversion through stdin, outputs human-readable information to stderr.
 /// Automatically skips 3073 bytes of handshake data.
diff --git a/src/buffer.cpp b/src/buffer.cpp
index 17f04b78..9696a2ba 100644
--- a/src/buffer.cpp
+++ b/src/buffer.cpp
@@ -1,4 +1,4 @@
-/// \file Buffer/main.cpp
+/// \file buffer.cpp
 /// Contains the main code for the Buffer.
 
 #include <fcntl.h>
diff --git a/src/buffer_stats.cpp b/src/buffer_stats.cpp
deleted file mode 100644
index e63f6a06..00000000
--- a/src/buffer_stats.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "buffer_stats.h"
-#include <stdlib.h> //for atoi()
-
-Buffer::Stats::Stats(){
-  up = 0;
-  down = 0;
-  conntime = 0;
-}
-
-Buffer::Stats::Stats(std::string s){
-  size_t f = s.find(' ');
-  if (f != std::string::npos){
-    host = s.substr(0, f);
-    s.erase(0, f+1);
-  }
-  f = s.find(' ');
-  if (f != std::string::npos){
-    connector = s.substr(0, f);
-    s.erase(0, f+1);
-  }
-  f = s.find(' ');
-  if (f != std::string::npos){
-    conntime = atoi(s.substr(0, f).c_str());
-    s.erase(0, f+1);
-  }
-  f = s.find(' ');
-  if (f != std::string::npos){
-    up = atoi(s.substr(0, f).c_str());
-    s.erase(0, f+1);
-    down = atoi(s.c_str());
-  }
-}
diff --git a/src/buffer_stats.h b/src/buffer_stats.h
deleted file mode 100644
index 38a31c29..00000000
--- a/src/buffer_stats.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#include <string>
-
-namespace Buffer{
-  /// Converts a stats line to up, down, host, connector and conntime values.
-  class Stats{
-    public:
-      unsigned int up;
-      unsigned int down;
-      std::string host;
-      std::string connector;
-      unsigned int conntime;
-      Stats();
-      Stats(std::string s);
-  };
-}
diff --git a/src/buffer_stream.cpp b/src/buffer_stream.cpp
index 986115e1..b75ee742 100644
--- a/src/buffer_stream.cpp
+++ b/src/buffer_stream.cpp
@@ -1,3 +1,6 @@
+/// \file buffer_stream.cpp
+/// Contains definitions for buffer streams.
+
 #include "buffer_stream.h"
 
 /// Stores the globally equal reference.
diff --git a/src/buffer_stream.h b/src/buffer_stream.h
index 016a1d5f..3cc9b4d1 100644
--- a/src/buffer_stream.h
+++ b/src/buffer_stream.h
@@ -1,3 +1,6 @@
+/// \file buffer_stream.h
+/// Contains definitions for buffer streams.
+
 #pragma once
 #include <string>
 #include "../lib/tinythread.h"
@@ -5,6 +8,7 @@
 #include "buffer_user.h"
 
 namespace Buffer{
+  /// Keeps track of a single streams inputs and outputs, taking care of thread safety and all other related issues.
   class Stream{
     public:
       /// Get a reference to this Stream object.
diff --git a/src/buffer_user.cpp b/src/buffer_user.cpp
index bdb481a7..f67422f7 100644
--- a/src/buffer_user.cpp
+++ b/src/buffer_user.cpp
@@ -1,6 +1,10 @@
+/// \file buffer_user.cpp
+/// Contains code for buffer users.
+
 #include "buffer_user.h"
 #include "buffer_stream.h"
 #include <sstream>
+#include <stdlib.h> //for atoi and friends
 
 int Buffer::user::UserCount = 0;
 
@@ -74,3 +78,35 @@ void Buffer::user::Send(){
   }//completed a send
   Stream::get()->dropReadLock();
 }//send
+
+/// Default constructor - should not be in use.
+Buffer::Stats::Stats(){
+  up = 0;
+  down = 0;
+  conntime = 0;
+}
+
+/// Reads a stats string and parses it to the internal representation.
+Buffer::Stats::Stats(std::string s){
+  size_t f = s.find(' ');
+  if (f != std::string::npos){
+    host = s.substr(0, f);
+    s.erase(0, f+1);
+  }
+  f = s.find(' ');
+  if (f != std::string::npos){
+    connector = s.substr(0, f);
+    s.erase(0, f+1);
+  }
+  f = s.find(' ');
+  if (f != std::string::npos){
+    conntime = atoi(s.substr(0, f).c_str());
+    s.erase(0, f+1);
+  }
+  f = s.find(' ');
+  if (f != std::string::npos){
+    up = atoi(s.substr(0, f).c_str());
+    s.erase(0, f+1);
+    down = atoi(s.c_str());
+  }
+}
diff --git a/src/buffer_user.h b/src/buffer_user.h
index 607f2549..9cfb950a 100644
--- a/src/buffer_user.h
+++ b/src/buffer_user.h
@@ -1,11 +1,25 @@
+/// \file buffer_user.h
+/// Contains definitions for buffer users.
+
 #pragma once
 #include <string>
-#include "buffer_stats.h"
 #include "../lib/dtsc.h"
 #include "../lib/socket.h"
 #include "../lib/tinythread.h"
 
 namespace Buffer{
+  /// Converts a stats line to up, down, host, connector and conntime values.
+  class Stats{
+  public:
+    unsigned int up;
+    unsigned int down;
+    std::string host;
+    std::string connector;
+    unsigned int conntime;
+    Stats();
+    Stats(std::string s);
+  };
+
   /// Holds connected users.
   /// Keeps track of what buffer users are using and the connection status.
   class user{
diff --git a/src/conn_http.cpp b/src/conn_http.cpp
index 0c6635bc..961d4c34 100644
--- a/src/conn_http.cpp
+++ b/src/conn_http.cpp
@@ -1,4 +1,4 @@
-/// \file Connector_HTTP/main.cpp
+/// \file conn_http.cpp
 /// Contains the main code for the HTTP Connector
 
 #include <iostream>
diff --git a/src/conn_raw.cpp b/src/conn_raw.cpp
index 1085923c..b131c6ce 100644
--- a/src/conn_raw.cpp
+++ b/src/conn_raw.cpp
@@ -1,4 +1,4 @@
-/// \file Connector_RAW/main.cpp
+/// \file conn_raw.cpp
 /// Contains the main code for the RAW connector.
 
 #include <iostream>
diff --git a/src/conn_rtmp.cpp b/src/conn_rtmp.cpp
index b45df30a..bc9abc3a 100644
--- a/src/conn_rtmp.cpp
+++ b/src/conn_rtmp.cpp
@@ -1,4 +1,4 @@
-/// \file Connector_RTMP/main.cpp
+/// \file conn_rtmp.cpp
 /// Contains the main code for the RTMP Connector
 
 #include <iostream>
diff --git a/src/controller.cpp b/src/controller.cpp
index 073cde0a..6af37075 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -1,3 +1,6 @@
+/// \file controller.cpp
+/// Contains all code for the controller executable.
+
 #include <iostream>
 #include <fstream>
 #include <string>
@@ -21,9 +24,9 @@
 #include <sys/types.h>
 #include <signal.h>
 #include <sstream>
+#include <openssl/md5.h>
 #include "../lib/socket.h"
 #include "../lib/http_parser.h"
-#include "../lib/md5.h"
 #include "../lib/json.h"
 #include "../lib/procs.h"
 #include "../lib/config.h"
@@ -61,6 +64,17 @@ void signal_handler (int signum){
   API_Socket.close();
 }//signal_handler
 
+/// Wrapper function for openssl MD5 implementation
+std::string md5(std::string input){
+  char tmp[3];
+  std::string ret;
+  const unsigned char * res = MD5((const unsigned char*)input.c_str(), input.length(), 0);
+  for (int i = 0; i < 16; ++i){
+    snprintf(tmp, 3, "%02x", res[i]);
+    ret += tmp;
+  }
+  return ret;
+}
 
 
 JSON::Value Storage; ///< Global storage of data.
diff --git a/src/converters/dtsc2flv.cpp b/src/converters/dtsc2flv.cpp
index 2aaeaced..8f0199f0 100644
--- a/src/converters/dtsc2flv.cpp
+++ b/src/converters/dtsc2flv.cpp
@@ -1,4 +1,4 @@
-/// \file DTSC2FLV/main.cpp
+/// \file dtsc2flv.cpp
 /// Contains the code that will transform any valid DTSC input into valid FLVs.
 
 #include <iostream>
@@ -14,7 +14,7 @@
 #include "../../lib/dtsc.h" //DTSC support
 #include "../../lib/amf.h" //AMF support
 
-/// Holds all code that converts filetypes to DTSC.
+/// Holds all code that converts filetypes to/from DTSC.
 namespace Converters{
 
   /// Reads DTSC from STDIN, outputs FLV to STDOUT.
diff --git a/src/converters/flv2dtsc.cpp b/src/converters/flv2dtsc.cpp
index 403e29e6..4030ac09 100644
--- a/src/converters/flv2dtsc.cpp
+++ b/src/converters/flv2dtsc.cpp
@@ -1,4 +1,4 @@
-/// \file FLV2DTSC/main.cpp
+/// \file flv2dtsc.cpp
 /// Contains the code that will transform any valid FLV input into valid DTSC.
 
 #include <iostream>
@@ -14,7 +14,7 @@
 #include "../../lib/dtsc.h" //DTSC support
 #include "../../lib/amf.h" //AMF support
 
-/// Holds all code that converts filetypes to DTSC.
+/// Holds all code that converts filetypes to/from to DTSC.
 namespace Converters{
 
   /// Reads FLV from STDIN, outputs DTSC to STDOUT.
diff --git a/src/server_setup.h b/src/server_setup.h
index 902ffa7e..149cd8f3 100644
--- a/src/server_setup.h
+++ b/src/server_setup.h
@@ -1,4 +1,4 @@
-/// \file server_setup.cpp
+/// \file server_setup.h
 /// Contains generic functions for setting up a DDVTECH Connector.
 
 #ifndef MAINHANDLER