Fixed Comments and added some more