More comments and notes