1.6.4 - Full port to 1.6.4

Ported to 1.6.4, Includes network rehaul mostly