File pickers now work, minor code adjustments