More docs, lexical and some types