More small parts of the Entity system added