fix enum syntax
more updates
merge