Another pass at the 1.7 update - more to come tomorrow