Minor changes to refactoring; adding in more output files.