Add more EnumWrappers and legacyIds.

Fix/add some other stuff.
(Sorry, I dont know, hogy to remove old/merged commits)