Some comment cleanup, and fix so when closing the main window, it also closes the item select window