June 7th Final Updates

Some additions and tweaks.