More vocabulary + fixes.