fixed some fixmes