misc final changes