[FIX] Security + little bugs