Few changes to entity and fixed map, again...