added some new components, modified entity, added world