Expression comments, improvements