initial sweep of 1.7 updating
more work on 1.7 updates still WIP