misc fixes after conference with Xander