Edited README and fixed TODO.