More keywords, keyword docs, some tests.