minor updates after refs
Merge branch 'ae' into cf