More iheritance and vocabulary fixes