Fix Issue #1: Add comment toggle support