Fixed certain aspects of network play
merge into BETA!