further adjustments and work on the entity system