More comments and fix haste