More work on getEntity() method and entities.

Completed CanaryOcelot.