added missing Window.Title() and some cleanup