some misc changes