Fixed up the Entities a little