Fixed some code

Removed a darn lot of auto gen'd stubs. Corrected some enums.