Improved Comments again