Fixed Comments, Started adding World Managment