update recent changes in the master Extra166y sources.