[FIX] several improvements