eopt: fix some references
cls: fix toc bookmark pointing to wrong page
eopt: fixes