make docs and code match terminology, make README not 2000 characters wide