Bug fixes- still concerned about where output files are written