[FIX] several comments