minor working changes