Enhanced / fixed entities, added Simon