some misc minor changes