update README to reflect new vocabulary
update TODO