fixed the last bug! adding the rest of comments