improved commenting system