import window added filechooser && some namechanges