misc minor changes