Completed small TODOs
Changed the output file name
Better make file, variable for title