Various improvements, Rectangle structure.