Added a few additional tests.
Added some additional documentation. Some quick cleanup.