fixed some networking things. Fixed some camera things
merge commit