Cleaned up echo.
Cleaned up some files and updated TODO.