Added functionality to switch between files on results. Minor changes to other things.