[FIX] several things