some edits on entities