Improve rect-info