more updates to the entity, junkyard and spacemap