More fixes and updates for 1.7

This is another update for 1.7 to clear up some errors, possible bugs. Commits are squash to keep everything clean as possible.

This PR includes a network rewrite, full removal of id reference related to 1.6 and several other changes.