fixed game_object_factory
parameter names; removed comment
merge