Cleaned up top directory a little, updated TODO
Expanded unit tests, fixed another bug