Add window renumbering on close. Modify comments.