32 types + verbs and some corrections