Add commas in rect() and fix property order