[FIX] a few various things