Non-colliding rectangular done

As well as a few minor changes in the vector module.