final all the things
fixing enum types in model