further touchup improvements