More comments mostly