Update to 6.5
Add support for auto-closing cwindow