Make vocab consistent and add details