added some comments, fixed bugs, changed world