[FIX] a lot of little fix