Changing Comments and Fixing Bug