renamed world->geo, added light comp