fixed and added entities