Altered argument parsing and file formatting/comments