Updated output directory, comments, etc