improved comments support