merge minor solo changes