syntax fixes for models, use values of ENUMs for no duplication