Formatted Comments and add some additional info...