Fixed two genADDs, added auto output file naming

There were two self.o.write() calls that needed to be genADD() calls.
Added functionality to automatically output new filename for each run