More comments, including headers