Add the verb table and fix previous merge conflicts