misc changes, som of this is redudant