some code quality fixes; add IDs to enum values