some fixes
some fixesv2