Fixed file chooser, added other functionality