updating for enum exports, minor cleanup