More labeling and enums and comments