Fixed some todos on Effect and Entity class.