Some net work
Merge from remote friends
Fixed some errors