* Added TODO to README
* Cleaned up some code and UI