New vocabulary
Several bug fixes