Comments and small print problem fix