More comments and a few fixes