More comments and logging