Renamed world and added a few bits