Add references to base language
Use labeled fields for eval state
Consolidate notes