more 8.7 changes and some updates to eds references