merged and fixed, removed gameobject.h references