Added PlayerUpdateComponent and slight refactoring
Merge