Cleaned up some TODO items. Added a couple tests. Updated README