Made some corrections to the entities