some fixex