minor modifications of the vector handling section