[FIX] a few things