Completed 1.7 version update

This update is before I go.. I haven't gotten enough time to test it..
however I do believe everything should work.