June 16 updates

see comments for details