More code convention consistency. EntityExtras work. Problem with targeting system just introduced.