Some entity-object related functionality + readme changes